topo: fix for OriBundleAdj

micmacIGN · Jun 14, 2024 · 66756f0 · 66756f0
1 parent 08d3fcd
commit 66756f0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/MMVII/src/BundleAdjustment/cAppliBundAdj.cpp b/MMVII/src/BundleAdjustment/cAppliBundAdj.cpp
@@ -130,7 +130,7 @@ cCollecSpecArg2007 & cAppliBundlAdj::ArgOpt(cCollecSpecArg2007 & anArgOpt)
       << mPhProj.DPRigBloc().ArgDirInOpt("BRDirIn","Dir for Bloc Rigid if != DataDir") //  RIGIDBLOC
       << mPhProj.DPRigBloc().ArgDirOutOpt() //  RIGIDBLOC
       << mPhProj.DPTopoMes().ArgDirInOpt("TopoDirIn","Dir for Topo measures") //  TOPO
-      << mPhProj.DPTopoMes().ArgDirOutOpt() //  TOPO
+      << mPhProj.DPTopoMes().ArgDirOutOpt("TopoDirOut","Dir for Topo measures output") //  TOPO
       << AOpt2007
          (
             mGCPW,
@@ -271,7 +271,11 @@ int cAppliBundlAdj::Exe()
     {
         mBA.SetSharedIntrinsicParams(mVSharedIP);
     }
-
+
+    if (mPhProj.DPTopoMes().DirInIsInit())
+    {
+        mBA.AddTopo();
+    }
 
     if (IsInit(&mGCPW))  // Add if any first the standard GCP weighting
     {
@@ -301,11 +305,6 @@ int cAppliBundlAdj::Exe()
             mBA.AddCamBlocRig(aNameIm);
     }
 
-    if (mPhProj.DPTopoMes().DirInIsInit())
-    {
-        mBA.AddTopo();
-    }
-
     MMVII_INTERNAL_ASSERT_User(mMeasureAdded,eTyUEr::eUnClassedError,"Not any measure added");
 
     for (int aKIter=0 ; aKIter<mNbIter ; aKIter++)

diff --git a/MMVII/src/BundleAdjustment/cMMVII_BundleAdj.cpp b/MMVII/src/BundleAdjustment/cMMVII_BundleAdj.cpp
@@ -233,7 +233,10 @@ void cMMVII_BundleAdj::OneIteration(tREAL8 aLVM)
     if (mTopo) // TOPO
     {
         mTopo->AddTopoEquations(*mR8_Sys);
-        mTopo->printObs(true);
+    #ifdef VERBOSE_TOPO
+        mTopo->print();
+    #endif
+        mTopo->printObs(false);
     }
 
     const auto & aVectSol = mSys->R_SolveUpdateReset(aLVM);

diff --git a/MMVII/src/Topo/ctopoobsset.cpp b/MMVII/src/Topo/ctopoobsset.cpp
@@ -189,7 +189,7 @@ void cTopoObsSetStation::makeConstraints(cResolSysNonLinear<tREAL8> & aSys)
 bool cTopoObsSetStation::initialize()
 {
 #ifdef VERBOSE_TOPO
-    StdOut() << <<"cTopoObsSetStation::initialize "<<mOriginName<<std::endl;
+    StdOut() <<"cTopoObsSetStation::initialize "<<mOriginName<<std::endl;
 #endif
 
     // auto fix mStationIsOriented if has orientation obs