Merge branch 'mpd'

Author: deseilligny

MMVII/MMVII-UseCaseDataSet/Tests/Cmd-NewBlock.sh

@@ -0,0 +1,24 @@
+# MMVII OriBundleAdj Im-Calib_OK_Resec.xml  Pannel_BA1_311  Pannel_BA2_311 "GCP3D=[[Pannel,1]]" "GCP2D=[[Pannel,0.1,0.2,1,2]]" 
+
+set -e
+
+MMVII BlockInstrEdit BL0 "PatsIm4Cam=[Im-Calib.xml,.*_(.*).tif]"  #   InMeasureClino=MesClinFilA_043
+MMVII BlockInstrEdit BL0 InMeasureClino=MesClinFilA_043
+MMVII BlockInstrEdit BL0  CRO=[[A1,A2,1e-6,i-kj]]
+MMVII BlockInstrEdit BL0  CRO=[[B1,B2,1e-6,i-kj]]
+
+
+
+MMVII BlockInstrInitCam Im-Calib_OK_Resec.xml BL0 Pannel_BA2_311 BL1    
+
+
+MMVII OriBundleAdj Im-Calib_OK_Resec.xml  Pannel_BA2_311  Pannel_BA3_311 "GCP3D=[[Pannel,1]]" "GCP2D=[[Pannel,0.1,0.2,1,2]]" InInstrBlock=BL1 OutInstrBlock=BL2   BOI=[[,0.01,0.01,1],[]] NbIter=10
+
+
+#MMVII BlockInstrInitClino Im-Calib_OK_Resec.xml BL2 Pannel_BA3_311 
+
+
+#MMVII BlockInstrEdit BL2  InMeasureClino=MesClinFilA_043 OutInstrBlock=BL3
+
+
+

MMVII/include/MMVII_2Include_Tiling.h

@@ -6,7 +6,10 @@
 
 namespace MMVII
 {
-
+/** \brief : file for indexation by tiling
+ *  \file : MMVII_2Include_Tiling.h
+ *
+ */
 template <const int Dim> class cTilingIndex;
 template <class Type>  class  cTiling ;
 

MMVII/include/MMVII_AllClassDeclare.h

@@ -99,6 +99,7 @@ template <class Type> class cUnOrderedPair ;
 typedef cSelector<std::string>      tNameSelector;
 typedef cExtSet<std::string>        tNameSet;
 typedef cUnOrderedPair<std::string>   tNamePair; ///< Order does not matter
+typedef cUnOrderedPair<int>            tIntPair; ///< Order does not matter
 typedef std::pair<std::string,std::string>  tNameOCple;  ///< Order matters
 typedef cExtSet<tNamePair>          tNameRel;
 

MMVII/include/MMVII_DeclareAllCmd.h

@@ -19,6 +19,8 @@ extern cSpecMMVII_Appli  TheSpecEditRel;
 extern cSpecMMVII_Appli  TheSpec_EditCalcMetaDataImage;
 extern cSpecMMVII_Appli  TheSpec_EditBlockInstr;
 extern cSpecMMVII_Appli  TheSpec_BlockInstrInitCam;
+extern cSpecMMVII_Appli  TheSpec_BlockInstrInitClino;
+extern cSpecMMVII_Appli  TheSpec_BlockInstrReport;
 extern cSpecMMVII_Appli  TheSpecWalkman;
 extern cSpecMMVII_Appli  TheSpecDaisy;
 extern cSpecMMVII_Appli  TheSpecCatVideo;