Bundle Line 2 debug ...

Author: deseilligny

MMVII/src/BundleAdjustment/BundleAdjustment.h

@@ -454,14 +454,16 @@ class cMMVII_BundleAdj
           void SetSharedIntrinsicParams(const std::vector<std::string> &);
 
 
-	  void AddPoseViscosity();
-	  void AddConstrainteRefPose();
+          void AddPoseViscosity();
+          void AddConstrainteRefPose();
           void AddConstrainteRefPose(cSensorCamPC & aCam,cSensorCamPC & aCamRef);
 
 
-	  void AddLineAdjust(const std::vector<std::string> &);
+          void AddLineAdjust(const std::vector<std::string> &);
+          void DeleteLineAdjust();
+          void IterAdjustOnLine();
 
-	  void SaveBlocRigid();
+          void SaveBlocRigid();
           void Save_newGCP3D();
           void SaveTopo();
 
@@ -477,7 +479,6 @@ class cMMVII_BundleAdj
 
           cSetInterUK_MultipeObj<tREAL8> &   SetIntervUK();
      private :
-	  void DeleteLineAdjust();
 
           //============== Methods =============================
           cMMVII_BundleAdj(const cMMVII_BundleAdj &) = delete;

MMVII/src/BundleAdjustment/BundleLines.cpp

@@ -367,6 +367,12 @@ void cUK_Line3D_4BA::AddEquation()
     }
 }
 
+/* *********************************************************** */
+/*                                                             */
+/*                 cMMVII_BundleAdj                            */
+/*                                                             */
+/* *********************************************************** */
+
 void cMMVII_BundleAdj::AddLineAdjust(const std::vector<std::string> & aVParam)
 {
    tREAL8 aSigmaIm =  cStrIO<double>::FromStr(aVParam.at(0));
@@ -376,6 +382,11 @@ void cMMVII_BundleAdj::AddLineAdjust(const std::vector<std::string> & aVParam)
    mSetIntervUK.AddOneObj(mLineAdjust);
 }
 
+void cMMVII_BundleAdj::IterAdjustOnLine()
+{
+    if (mLineAdjust)
+        mLineAdjust->AddEquation();
+}
 
 
 // cUK_Line3D_4BA::cUK_Line3D_4BA(const std::vector<cSensorCamPC *> & aVCam,cPhotogrammetricProject * aPhProj,cMMVII_BundleAdj *  aBA) :

MMVII/src/BundleAdjustment/cAppliBundAdj.cpp

@@ -101,6 +101,7 @@ class cAppliBundlAdj : public cMMVII_Appli
         bool                      mShow_Cond; ///< compute and show system condition number
         std::vector<std::string>  mParamShow_UK_UC;
         std::string               mPostFixReport;
+        std::vector<std::string>  mParamLine;
 };
 
 cAppliBundlAdj::cAppliBundlAdj(const std::vector<std::string> & aVArgs,const cSpecMMVII_Appli & aSpec) :
@@ -164,6 +165,7 @@ cCollecSpecArg2007 & cAppliBundlAdj::ArgOpt(cCollecSpecArg2007 & anArgOpt)
       << AOpt2007(mShow_Cond,"Cond","Compute and show system condition number")
       << AOpt2007(mParamShow_UK_UC,"UC_UK","Param for uncertainty & Show names of unknowns (tuning)")
       << AOpt2007(mPostFixReport,NameParamPostFixReport(),CommentParamPostFixReport())
+      << AOpt2007(mParamLine,"AdjLine3D","Parameter for line Adjustment [SigmaIm,NbPtsSampl]",{{eTA2007::ISizeV,"[2,2]"}})
     ;
 }
 
@@ -324,6 +326,10 @@ int cAppliBundlAdj::Exe()
             mBA.AddCamBlocRig(aNameIm);
     }
 
+    if (IsInit(&mParamLine))
+    {
+        mBA.AddLineAdjust(mParamLine);
+    }
 
     if (mPhProj.DPClinoMeters().DirInIsInit())
     {