v5.23rc1

IGNF · Sep 9, 2024 · ae658bd · ae658bd
1 parent 9aecbb3
commit ae658bd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,8 +1,12 @@
-Comp V5.23 (next version):
- - proj 6 > 8.2
+Comp3D V5.23:
+ - update licence info
+ - proj 6 > 8/9
  - new rot export xyz
  - faster solver solver
  - change sigma_total
+ - cmake
  - sigma factor applicable to cartesian and polar subframes
+ - native windows compliation
+ - website
 
 
diff --git a/src/compile.h b/src/compile.h
@@ -42,7 +42,7 @@
 
 
 //---------------------------------- Settings ------------------------------------
-#define COMP3D_VERSION "COMP3D v5.23dev" "-PROJ " PROJ_VERSION "-" COMPILED_FOR
+#define COMP3D_VERSION "COMP3D v5.23rc1" "-PROJ " PROJ_VERSION "-" COMPILED_FOR
 #define COMP3D_COPYRIGHT "Copyright 1992-2024 IGN France www.ign.fr"
 #define COMP3D_LICENSE "Provided with absolutely no warranty, under GPLv3 license"
 #define COMP3D_CONTACT "comp3d@ign.fr"

diff --git a/src/station_axis.cpp b/src/station_axis.cpp
@@ -334,7 +334,7 @@ bool Station_Axis::read_obs(std::string line,
             for (auto &aobs: target.allAxisObs)
             {
             #ifdef INFO_AXE
-                std::cout<<"Checking "<<aobs->getPosNum()<<"-"<<target->getTargetNum()<<" "<<aobs->getPt()->name<<"\n";
+                std::cout<<"Checking "<<aobs.getPosNum()<<"-"<<target.getTargetNum()<<" "<<aobs.getPt()->name<<"\n";
             #endif
                 ret = pointsSet.insert(aobs.getPt()->name);
                 if (!ret.second)
@@ -532,6 +532,9 @@ bool Station_Axis::initialize(bool verbose)
                                     origin()->name.c_str());
         return false;
     }
+#ifdef INFO_AXE
+    std::cout<<"Station_Axis::initialize best_target_wingspan: "<<best_target_wingspan<<"\n";
+#endif
 
     //get 3 good positions of that target
     auto bestPos=best_target->get3BestPos();