Created TriangleDeformationUtils.cpp file for methods than are common…

… to all commands and transformed to functions. Added reading of correlation mask from MMVI for initialisation with MMVI, along with a class for triangulation nodes and serialising them. Helped auto-completion and hid rarely used command options. New command ComputeNodesPrecision is implemented.
micmacIGN · Jul 24, 2024 · e637da9 · e637da9
1 parent c74aefe
commit e637da9
Show file tree

Hide file tree

Showing 23 changed files with 2,574 additions and 2,731 deletions.
diff --git a/MMVII/include/MMVII_DeclareAllCmd.h b/MMVII/include/MMVII_DeclareAllCmd.h
@@ -82,20 +82,19 @@ extern cSpecMMVII_Appli  TheSpec_ConvertV1V2_GCPIM;
 extern cSpecMMVII_Appli  TheSpec_SpecSerial;
 extern cSpecMMVII_Appli  TheSpec_CGPReport;
 extern cSpecMMVII_Appli  TheSpec_TiePReport;
+extern cSpecMMVII_Appli  TheSpec_SimulDispl;
 extern cSpecMMVII_Appli  TheSpec_RandomGeneratedDelaunay;
 extern cSpecMMVII_Appli  TheSpec_ComputeTriangleDeformation;
-extern cSpecMMVII_Appli  TheSpec_ComputeTriangleDeformationTrRad;
 extern cSpecMMVII_Appli  TheSpec_ComputeTriangleDeformationTranslation;
 extern cSpecMMVII_Appli  TheSpec_ComputeTriangleDeformationRadiometry;
-extern cSpecMMVII_Appli  TheSpec_ComputeTriangleDeformationRad;
+extern cSpecMMVII_Appli  TheSpec_ComputeNodesPrecision;
 extern cSpecMMVII_Appli  TheSpec_PoseCmpReport;
 extern cSpecMMVII_Appli  TheSpec_BlockCamInit;   // RIGIDBLOC
 extern cSpecMMVII_Appli  TheSpec_ClinoInit;
 extern cSpecMMVII_Appli  TheSpecRename;
 extern cSpecMMVII_Appli  TheSpec_V2ImportCalib;
 extern cSpecMMVII_Appli  TheSpec_ImportOri;
 extern cSpecMMVII_Appli  TheSpecDicoRename;
-extern cSpecMMVII_Appli  TheSpec_SimulDispl;
 extern cSpecMMVII_Appli  TheSpec_CreateRTL;
 extern cSpecMMVII_Appli  TheSpec_TestProj;
 extern cSpecMMVII_Appli  TheSpec_ChSysCo;

diff --git a/MMVII/include/MMVII_PhgrDist.h b/MMVII/include/MMVII_PhgrDist.h
@@ -200,14 +200,10 @@ NS_SymbolicDerivative::cCalculator<double> * EqDeformImHomotethy(bool WithDerive
 NS_SymbolicDerivative::cCalculator<double> * EqDeformImLinearGradHomotethy(bool WithDerive,int aSzBuf);
 /// Equation used to optimize translation and radiometry transformation between two images.
 NS_SymbolicDerivative::cCalculator<double> *EqDeformTri(bool WithDerive, int aSzBuf);
-/// Equation used to optimize translation and radiometry transformation between two images with alternative equation
-NS_SymbolicDerivative::cCalculator<double> *EqDeformTriTrRad(bool WithDerive, int aSzBuf);
 /// Equation used to optimize translation transformation between two images.
 NS_SymbolicDerivative::cCalculator<double> *EqDeformTriTranslation(bool WithDerive, int aSzBuf);
 /// Equation used to optimize radiometric transformation between two images.
 NS_SymbolicDerivative::cCalculator<double> *EqDeformTriRadiometry(bool WithDerive, int aSzBuf);
-/// Equation used to optimize radiometric transformation between two images with alternate equation
-NS_SymbolicDerivative::cCalculator<double> *EqDeformTriRad(bool WithDerive, int aSzBuf);
 
            // .............   Covariance propagation  .............
 

diff --git a/MMVII/include/MMVII_TplSymbTriangle.h b/MMVII/include/MMVII_TplSymbTriangle.h
@@ -7,7 +7,7 @@
 #include "MMVII_Ptxd.h"
 #include "MMVII_Geom2D.h"
 
-#include "../src/MeshDisplacement/TriangleDeformation.h"
+#include "../src/MeshDisplacement/TriangleDeformationUtils.h"
 
 /**
  \file MMVII_TplSymbTriangle.h

diff --git a/MMVII/src/Appli/cSpecMMVII_Appli.cpp b/MMVII/src/Appli/cSpecMMVII_Appli.cpp
@@ -176,8 +176,8 @@ std::vector<cSpecMMVII_Appli *> & cSpecMMVII_Appli::InternVecAll()
         TheVecAll.push_back(&TheSpecCalcDiscIm);
         TheVecAll.push_back(&TheSpecCalcDescPCar);
         TheVecAll.push_back(&TheSpecMatchTieP);
-	TheVecAll.push_back(&TheSpec_TiePConv);
-	TheVecAll.push_back(&TheSpec_ToTiePMul);
+	     TheVecAll.push_back(&TheSpec_TiePConv);
+	     TheVecAll.push_back(&TheSpec_ToTiePMul);
         TheVecAll.push_back(&TheSpecEpipGenDenseMatch);
         TheVecAll.push_back(&TheSpecEpipDenseMatchEval);
         TheVecAll.push_back(&TheSpecGenSymbDer);
@@ -234,17 +234,16 @@ std::vector<cSpecMMVII_Appli *> & cSpecMMVII_Appli::InternVecAll()
         TheVecAll.push_back(&TheSpec_V2ImportCalib);
         TheVecAll.push_back(&TheSpec_ImportOri);
         TheVecAll.push_back(&TheSpecDicoRename);
-        TheVecAll.push_back(&TheSpec_SimulDispl);
         TheVecAll.push_back(&TheSpec_CreateRTL);
         TheVecAll.push_back(&TheSpec_TestProj);
         TheVecAll.push_back(&TheSpec_ChSysCo);
         TheVecAll.push_back(&TheSpec_CreateCalib);
+        TheVecAll.push_back(&TheSpec_SimulDispl);
         TheVecAll.push_back(&TheSpec_RandomGeneratedDelaunay);
         TheVecAll.push_back(&TheSpec_ComputeTriangleDeformation);
-        TheVecAll.push_back(&TheSpec_ComputeTriangleDeformationTrRad);
         TheVecAll.push_back(&TheSpec_ComputeTriangleDeformationTranslation);
         TheVecAll.push_back(&TheSpec_ComputeTriangleDeformationRadiometry);
-        TheVecAll.push_back(&TheSpec_ComputeTriangleDeformationRad);
+        TheVecAll.push_back(&TheSpec_ComputeNodesPrecision);
         TheVecAll.push_back(&TheSpec_ImportTiePMul);
         TheVecAll.push_back(&TheSpec_ImportMesImGCP);
         TheVecAll.push_back(&TheSpecImportExtSens);