Update Argentique-Sat example

micmacIGN · Jan 27, 2025 · 1f1de2c · 1f1de2c
1 parent bbb33ac
commit 1f1de2c
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 17 deletions.
diff --git a/MMVII/MMVII-UseCaseDataSet/Argentique-Sat/CmdV2.sh b/MMVII/MMVII-UseCaseDataSet/Argentique-Sat/CmdV2.sh
@@ -1,8 +1,8 @@
 set -e
 
-MMVII EditSet Satellite.xml += Crop.*tif
-MMVII EditSet Aerial.xml += OIS-Reech_.*tif
-MMVII EditSet AllIm.xml += .*tif
+#MMVII EditSet Satellite.xml += Crop.*tif
+#MMVII EditSet Aerial.xml += OIS-Reech_.*tif
+#MMVII EditSet AllIm.xml += .*tif
 
 # Import V1 points : 
 #MMVII TiePConvert  ".*tif" MMV1 V1 V1Ext=_Merged-SuperGlue Post=dat
@@ -29,26 +29,22 @@ MMVII OriChSysCo Satellite.xml RTL V1Sat SatRTL
 MMVII OriParametrizeSensor Satellite.xml SatRTL RTL 0 
 
 #   MMVII OriChSysCo "OIS.*tif" RTL V1Conik  RTL
-#MMVII OriChSysCo "OIS.*tif" RTL V1Conik  RTL SysIn=Lambert93
-MMVII OriChSysCo Aerial.xml RTL V1Conik  RTL SysIn=Lambert93
+#MMVII OriChSysCo "OIS.*tif" RTL V1Conik  RTL SysIn=L93
+MMVII OriChSysCo Aerial.xml RTL V1Conik  RTL SysIn=L93
 
 
-#MMVII TestSensor  .*tif       RTL NbProc=1 OutPointsMeasure=RTLRef SzGen=[7,3]
-#MMVII TestSensor  OIS-.*.tif  RTL NbProc=1 OutPointsMeasure=Conik-RTLRef SzGen=[7,3]
-#MMVII TestSensor  Crop.*tif   RTL NbProc=1 OutPointsMeasure=Sat-RTLRef SzGen=[7,3]
-MMVII TestSensor  AllIm.xml       RTL NbProc=1 OutPointsMeasure=RTLRef SzGen=[7,3]
-MMVII TestSensor  Aerial.xml  RTL NbProc=1 OutPointsMeasure=Conik-RTLRef SzGen=[7,3]
-MMVII TestSensor  Satellite.xml  RTL NbProc=1 OutPointsMeasure=Sat-RTLRef SzGen=[7,3]
+MMVII TestSensor  AllIm.xml       RTL NbProc=1 OutObjCoordWorld=RTLRef OutObjMesInstr=RTLRef SzGen=[7,3]
+MMVII TestSensor  Aerial.xml  RTL NbProc=1 OutObjCoordWorld=Conik-RTLRef OutObjMesInstr=Conik-RTLRef SzGen=[7,3]
+MMVII TestSensor  Satellite.xml  RTL NbProc=1 OutObjCoordWorld=Sat-RTLRef OutObjMesInstr=Sat-RTLRef SzGen=[7,3]
 
 
-#MMVII OriBundleAdj   ".*tif" RTL  AdjRTL GCPDir=Conik-RTLRef GCPW=[0,1] TPDir=V1 TiePWeight=[0.1,0.5]
-MMVII OriBundleAdj  AllIm.xml RTL  AdjRTL GCPDir=Conik-RTLRef GCPW=[0,1] TPDir=V1 TiePWeight=[0.1,0.5]
+MMVII OriBundleAdj  AllIm.xml RTL  AdjRTL GCP2D=[[Conik-RTLRef,1]] GCP3D=[[Conik-RTLRef,0]] TPDir=V1 TiePWeight=[0.1,0.5]
 
 
 #MMVII OriParametrizeSensor "Crop.*" SatRTL RTL 0  RandomPerturb=0.001
 #MMVII OriBundleAdj   ".*tif" RTL  AdjRTL GCPDir=Conik-RTLRef GCPW=[0,1] TPDir=V1 TiePWeight=[0.1,0.5]
 MMVII OriParametrizeSensor Satellite.xml SatRTL RTL 0  RandomPerturb=0.001
-MMVII OriBundleAdj  AllIm.xml RTL  AdjRTL GCPDir=RTLRef GCPW=[0,1] TPDir=V1 TiePWeight=[0.1,0.5]
+MMVII OriBundleAdj  AllIm.xml RTL  AdjRTL GCP2D=[[RTLRef,1]] GCP3D=[[RTLRef,0]] TPDir=V1 TiePWeight=[0.1,0.5]
 
 
 

diff --git a/MMVII/src/Sensors/cTestSensor.cpp b/MMVII/src/Sensors/cTestSensor.cpp
@@ -140,7 +140,7 @@ void cAppliTestSensor::ExportMeasures(const  cSensorImage & aSI) const
         aSet3D.AddMeasure3D(cMes1Gnd3D(aPair.mP3,aName,1.0));
 
     }
-    mPhProj.SaveGCP3D(aSet3D);
+    mPhProj.SaveGCP3D(aSet3D,mPhProj.DPGndPt3D().FullDirOut());
     mPhProj.SaveMeasureIm(aSet2D);
 }
 

diff --git a/MMVII/src/SysCo/ChSysCoGCP.cpp b/MMVII/src/SysCo/ChSysCoGCP.cpp
@@ -100,7 +100,7 @@ int cAppli_ChSysCoGCP::Exe()
 
 std::vector<std::string>  cAppli_ChSysCoGCP::Samples() const
 {
-   return {"MMVII SysCoCreateRTL "};
+   return {"MMVII GCPChSysCo RTL ORGI RTLSat SysIn=Geog"};
 }
 
 

diff --git a/MMVII/src/SysCo/ChSysCoOri.cpp b/MMVII/src/SysCo/ChSysCoOri.cpp
@@ -102,7 +102,7 @@ int cAppli_ChSysCoOri::Exe()
 
 std::vector<std::string>  cAppli_ChSysCoOri::Samples() const
 {
-   return {"MMVII SysCoCreateRTL "};
+   return {"MMVII OriChSysCo ImAerien.xml RTL  InitL93Up RTLD0"};
 }
 
 

diff --git a/MMVII/src/SysCo/CreateRTL.cpp b/MMVII/src/SysCo/CreateRTL.cpp
@@ -84,6 +84,7 @@ int cAppli_CreateRTL::Exe()
     std::string aDefSysCoIn;
     if (mPhProj.DPOrient().DirInIsInit())
     {
+        mPhProj.DPOrient().CheckDirExists(true, true);
         auto aSysIn = mPhProj.CurSysCoOri(true);
         if (aSysIn.get())
             aDefSysCoIn = aSysIn->Def();
-Original file line number
+Diff line change
@@ Expand Up / @@ -100,7 +100,7 @@ int cAppli_ChSysCoGCP::Exe() @@
     std::vector<std::string>  cAppli_ChSysCoGCP::Samples() const
     {
-       return {"MMVII SysCoCreateRTL "};
+       return {"MMVII GCPChSysCo RTL ORGI RTLSat SysIn=Geog"};
     }
@@ Expand Down @@