Bug altisol corrected

micmacIGN · May 20, 2021 · 2f2a48a · 2f2a48a
1 parent 6e289a3
commit 2f2a48a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/include/general/exemple_basculement.h b/include/general/exemple_basculement.h
@@ -55,6 +55,8 @@ class cL2EqObsBascult;
 /*                                                                           */
 /*****************************************************************************/
 
+extern bool DEBUG_GCP_BASCULE;
+
 class cSolBasculeRig : public cTransfo3D
 {
     public :

diff --git a/src/uti_phgrm/Apero/Basculement.cpp b/src/uti_phgrm/Apero/Basculement.cpp
@@ -1309,9 +1309,11 @@ void cAppliApero::BasculePlan
      //---------------------------------------------
 
 
+
 
 void cAppliApero::Bascule(const cBasculeOrientation & aBO,bool CalledAfter)
 {
+
    if (CalledAfter != aBO.AfterCompens().Val()) return;
    // cElRegex aSelectorEstim(aBO.PatternNameEstim().Val(),10);
    cSetName *  aSelectorEstim = mICNM->KeyOrPatSelector(aBO.PatternNameEstim().Val());

diff --git a/src/uti_phgrm/Apero/cPose.cpp b/src/uti_phgrm/Apero/cPose.cpp
@@ -1551,7 +1551,10 @@ void cPoseCam::PCSetCurRot(const ElRotation3D & aRot)
 
 void  cPoseCam::SetBascRig(const cSolBasculeRig & aSBR)
 {
-    PCSetCurRot(aSBR.TransformOriC2M(CurRot()));
+
+    //  Correc MPD 20/05/21 : put PCSetCurRot  after aP =  aSBR(aP);
+    // else the bascule on the point is done twice and altisol is bad ...
+    // PCSetCurRot(aSBR.TransformOriC2M(CurRot()));
 
     Pt3dr aP;
     if (mSomPM)
@@ -1565,13 +1568,17 @@ void  cPoseCam::SetBascRig(const cSolBasculeRig & aSBR)
         if (mProfondeur == PROF_UNDEF())
         {
             std::cout << "Warn : NoProfInBasc For camera =" << mName << "\n";
+            PCSetCurRot(aSBR.TransformOriC2M(CurRot()));
+            return;
             // ELISE_ASSERT( false,"No Profondeur in cPoseCam::SetBascRig");
-            return ;
         }
-
-        aP =  aCS->ImEtProf2Terrain(aCS->Sz()/2.0,mProfondeur);
-        aP =  aSBR(aP);
+        else
+        {
+            aP =  aCS->ImEtProf2Terrain(aCS->Sz()/2.0,mProfondeur);
+            aP =  aSBR(aP);
+        }
     }
+    PCSetCurRot(aSBR.TransformOriC2M(CurRot()));
 
 
 

diff --git a/src/uti_phgrm/CPP_Apero.cpp b/src/uti_phgrm/CPP_Apero.cpp
@@ -56,8 +56,9 @@ void Apero_Banniere()
 
 extern const char * theNameVar_ParamApero[];
 
+
 int Apero_main(int argc,char ** argv)
-{
+{ 
    MMD_InitArgcArgv(argc,argv);
 
    AddEntryStringifie
@@ -91,6 +92,7 @@ int Apero_main(int argc,char ** argv)
    L2SYM = aP2.mObj->AllMatSym().Val();
    cAppliApero   anAppli (aP2);
 
+
    if (anAppli.ModeMaping())
    {
        anAppli.DoMaping(argc,argv);