Skip to content

Commit

Permalink
ObjCoordWorld / ObjMesInstr
Browse files Browse the repository at this point in the history
  • Loading branch information
@jmmuller
jmmuller committed Jan 14, 2025
1 parent 325306b commit 5ab7080
Show file tree
Hide file tree
Showing 22 changed files with 39 additions and 39 deletions.
8 changes: 4 additions & 4 deletions MMVII/include/MMVII_enums.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ enum class eTA2007
MeshDev, ///< Mesh Devlopment
Mask, ///< Mask of image
MetaData, ///< Meta data images
GndPt3D, ///< 3D Measure/coords of ground points
GndPt2D, ///< 2D Measure/coords of ground points
ObjCoordWorld, ///< 3D Measure/coords of ground points
ObjMesInstr, ///< 2D Measure/coords of ground points
TieP, ///< Tie Points
MulTieP, ///< Multiple Tie Points
RigBlock, ///< Rigid bloc // RIGIDBLOC
Expand Down Expand Up @@ -143,8 +143,8 @@ enum class eApDT
Ori, ///< Orientation
PCar, ///< Tie Points
TieP, ///< Tie Points
GndPt2D, ///< Ground Points image coords
GndPt3D, ///< Ground Points ground coords
ObjMesInstr, ///< Ground Points image coords
ObjCoordWorld, ///< Ground Points ground coords
Lines, ///< Tie Points
Image, ///< Image
Orient, ///< Orientations files
Expand Down
4 changes: 2 additions & 2 deletions MMVII/src/Appli/cMMVII_GenArgsSpec.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ static const std::vector<eTA2007> prjSubDirList = // c
eTA2007::MeshDev,
eTA2007::Mask,
eTA2007::MetaData,
eTA2007::GndPt3D,
eTA2007::GndPt2D,
eTA2007::ObjCoordWorld,
eTA2007::ObjMesInstr,
eTA2007::TieP,
eTA2007::MulTieP,
eTA2007::RigBlock, // RIGIDBLOC
Expand Down
4 changes: 2 additions & 2 deletions MMVII/src/BundleAdjustment/cAppliTopoAdj.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,8 @@ cSpecMMVII_Appli TheSpec_TopoAdj
Alloc_TopoAdj,
"Topo adjustment",
{eApF::Topo},
{eApDT::GndPt3D, eApDT::Topo},
{eApDT::GndPt3D},
{eApDT::ObjCoordWorld, eApDT::Topo},
{eApDT::ObjCoordWorld},
__FILE__
);

Expand Down
2 changes: 1 addition & 1 deletion MMVII/src/Exports/ExportUndistMesIm.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ cSpecMMVII_Appli TheSpec_ExportUndistMesIm
Alloc_Test_ExportUndistMesIm,
"Export image points measurements corrected from distorsion",
{eApF::Ori,eApF::GCP},
{eApDT::Ori,eApDT::GndPt2D},
{eApDT::Ori,eApDT::ObjMesInstr},
{eApDT::Console},
__FILE__
);
Expand Down
4 changes: 2 additions & 2 deletions MMVII/src/Exports/MMV2_MesIm_2_MMV1.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,8 @@ cSpecMMVII_Appli TheSpec_MMV2_MesIm_2_MMV1
Alloc_Test_MMV2_MesIm_2_MMV1,
"Export image measurements format from MicMac v2 to MicMac v1",
{eApF::GCP},
{eApDT::GndPt2D},
{eApDT::GndPt2D},
{eApDT::ObjMesInstr},
{eApDT::ObjMesInstr},
__FILE__
);

Expand Down
2 changes: 1 addition & 1 deletion MMVII/src/ImagesInfoExtract/cAppliExtractLine.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,7 @@ cSpecMMVII_Appli TheSpecAppliExtractLine
Alloc_AppliExtractLine,
"Extraction of lines",
{eApF::Ori},
{eApDT::Ori,eApDT::GndPt2D},
{eApDT::Ori,eApDT::ObjMesInstr},
{eApDT::Console},
__FILE__
);
Expand Down
4 changes: 2 additions & 2 deletions MMVII/src/ImportFormat/ImportGCP.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,8 +221,8 @@ cSpecMMVII_Appli TheSpec_ImportGCP
Alloc_ImportGCP,
"Import/Convert basic GCP file in MMVII format",
{eApF::GCP},
{eApDT::GndPt3D},
{eApDT::GndPt3D},
{eApDT::ObjCoordWorld},
{eApDT::ObjCoordWorld},
__FILE__
);

Expand Down
4 changes: 2 additions & 2 deletions MMVII/src/ImportFormat/ImportMes32.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@ cSpecMMVII_Appli TheSpec_ImportM32
Alloc_ImportM32,
"Import/Convert Set of 3d-2d corresspondances",
{eApF::GCP},
{eApDT::GndPt3D, eApDT::GndPt2D},
{eApDT::GndPt3D, eApDT::GndPt2D},
{eApDT::ObjCoordWorld, eApDT::ObjMesInstr},
{eApDT::ObjCoordWorld, eApDT::ObjMesInstr},
__FILE__
);
#if (0)
Expand Down
2 changes: 1 addition & 1 deletion MMVII/src/ImportFormat/ImportOrgi.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ cSpecMMVII_Appli TheSpec_ImportORGI
"Import data coming from \"ORGI\" format",
{eApF::GCP,eApF::TieP},
{eApDT::FileSys},
{eApDT::TieP,eApDT::GndPt2D,eApDT::GndPt3D},
{eApDT::TieP,eApDT::ObjMesInstr,eApDT::ObjCoordWorld},
__FILE__
);

Expand Down
4 changes: 2 additions & 2 deletions MMVII/src/ImportFormat/ImportTiepMul.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,8 +290,8 @@ cSpecMMVII_Appli TheSpec_ImportMesGndPt2D
Alloc_ImportMesGndPt2D,
"Import/Convert basic image point measures into MMVII format",
{eApF::GCP},
{eApDT::GndPt2D},
{eApDT::GndPt2D},
{eApDT::ObjMesInstr},
{eApDT::ObjMesInstr},
__FILE__
);

Expand Down
4 changes: 2 additions & 2 deletions MMVII/src/ImportFormat/MergeMesImGCP.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ cSpecMMVII_Appli TheSpec_MergeMesImGCP
Alloc_MergeMesImGCP,
"Merge different files of image measur of GCP",
{eApF::GCP},
{eApDT::GndPt2D},
{eApDT::GndPt2D},
{eApDT::ObjMesInstr},
{eApDT::ObjMesInstr},
__FILE__
);

Expand Down
4 changes: 2 additions & 2 deletions MMVII/src/ImportFormat/V1ImportGCP.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@ cSpecMMVII_Appli TheSpec_ConvertV1V2_GCPIM
Alloc_ConvertV1V2_GCPIM,
"Convert image & gound measures from v1 to v2 format",
{eApF::GCP, eApF::TieP},
{eApDT::GndPt3D, eApDT::GndPt2D, eApDT::TieP},
{eApDT::GndPt3D, eApDT::GndPt2D, eApDT::TieP},
{eApDT::ObjCoordWorld, eApDT::ObjMesInstr, eApDT::TieP},
{eApDT::ObjCoordWorld, eApDT::ObjMesInstr, eApDT::TieP},
__FILE__
);

Expand Down
2 changes: 1 addition & 1 deletion MMVII/src/OrientReport/GCPQuality.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ cSpecMMVII_Appli TheSpec_CGPReport
Alloc_CGPReport,
"Reports on GCP projection",
{eApF::GCP, eApF::Ori},
{eApDT::GndPt3D, eApDT::GndPt2D, eApDT::Orient},
{eApDT::ObjCoordWorld, eApDT::ObjMesInstr, eApDT::Orient},
{eApDT::Image,eApDT::Xml},
__FILE__
);
Expand Down
2 changes: 1 addition & 1 deletion MMVII/src/OrientReport/MesImQuality.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ cSpecMMVII_Appli TheSpec_MesImReport
Alloc_MesImReport,
"Reports on Images measures compared to a reference",
{eApF::GCP,eApF::Ori},
{eApDT::GndPt2D,eApDT::Orient},
{eApDT::ObjMesInstr,eApDT::Orient},
{eApDT::Image,eApDT::Xml},
__FILE__
);
Expand Down
2 changes: 1 addition & 1 deletion MMVII/src/PoseEstim/CalibratedSpaceResection.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,7 @@ cSpecMMVII_Appli TheSpec_OriCalibratedSpaceResection
Alloc_CalibratedSpaceResection,
"Pose estimation from GCP, calibrated case",
{eApF::Ori},
{eApDT::GndPt3D, eApDT::GndPt2D},
{eApDT::ObjCoordWorld, eApDT::ObjMesInstr},
{eApDT::Orient},
__FILE__
);
Expand Down
2 changes: 1 addition & 1 deletion MMVII/src/PoseEstim/CheckGCPDist.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ cSpecMMVII_Appli TheSpec_OriCheckGCPDist
Alloc_CheckGCPDist,
"Check GCP distribution for pose estimation",
{eApF::Ori},
{eApDT::GndPt2D, eApDT::GndPt3D},
{eApDT::ObjMesInstr, eApDT::ObjCoordWorld},
{eApDT::Orient},
__FILE__
);
Expand Down
2 changes: 1 addition & 1 deletion MMVII/src/PoseEstim/UnCalibratedSpaceResection.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -864,7 +864,7 @@ cSpecMMVII_Appli TheSpec_OriUncalibSpaceResection
Alloc_UncalibSpaceResection,
"Pose estimation from GCP, uncalibrated case",
{eApF::Ori},
{eApDT::GndPt3D, eApDT::GndPt2D},
{eApDT::ObjCoordWorld, eApDT::ObjMesInstr},
{eApDT::Orient},
__FILE__
);
Expand Down
4 changes: 2 additions & 2 deletions MMVII/src/Sensors/cPhotogrammetricProject.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -288,8 +288,8 @@ cPhotogrammetricProject::cPhotogrammetricProject(cMMVII_Appli & anAppli) :
mDPRadiomModel (eTA2007::RadiomModel,*this),
mDPMeshDev (eTA2007::MeshDev,*this),
mDPMask (eTA2007::Mask,*this),
mDPGndPt3D (eTA2007::GndPt3D,*this),
mDPGndPt2D (eTA2007::GndPt2D,*this),
mDPGndPt3D (eTA2007::ObjCoordWorld,*this),
mDPGndPt2D (eTA2007::ObjMesInstr,*this),
mDPTieP (eTA2007::TieP,*this),
mDPMulTieP (eTA2007::MulTieP,*this),
mDPMetaData (eTA2007::MetaData,*this),
Expand Down
2 changes: 1 addition & 1 deletion MMVII/src/Sensors/cTestSensor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ cSpecMMVII_Appli TheSpecTestSensor
Alloc_TestImportSensors,
"Test orientation functions of a sensor : coherence Direct/Inverse, ground truth 2D/3D correspondance, generate 3d-2d corresp",
{eApF::Ori},
{eApDT::Ori,eApDT::GndPt2D,eApDT::GndPt3D},
{eApDT::Ori,eApDT::ObjMesInstr,eApDT::ObjCoordWorld},
{eApDT::Console},
__FILE__
);
Expand Down
8 changes: 4 additions & 4 deletions MMVII/src/Serial/ElemStrToVal.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,8 +228,8 @@ template<> cE2Str<eTA2007>::tMapE2Str cE2Str<eTA2007>::mE2S
{eTA2007::MeshDev,"MeshDev"},
{eTA2007::Mask,"Mask"},
{eTA2007::MetaData,"MetaData"},
{eTA2007::GndPt2D,"GndPt2D"},
{eTA2007::GndPt3D,"GndPt3D"},
{eTA2007::ObjMesInstr,"ObjMesInstr"},
{eTA2007::ObjCoordWorld,"ObjCoordWorld"},
{eTA2007::TieP,"TieP"},
{eTA2007::MulTieP,"MulTieP"},
{eTA2007::RigBlock,"RigBlock"},
Expand Down Expand Up @@ -281,8 +281,8 @@ template<> cE2Str<eApDT>::tMapE2Str cE2Str<eApDT>::mE2S
{eApDT::Ori,"Ori"},
{eApDT::PCar,"PCar"},
{eApDT::TieP,"TieP"},
{eApDT::GndPt2D,"GndPt2D"},
{eApDT::GndPt3D,"GndPt3D"},
{eApDT::ObjMesInstr,"ObjMesInstr"},
{eApDT::ObjCoordWorld,"ObjCoordWorld"},
{eApDT::Lines,"Lines"},
{eApDT::Image,"Image"},
{eApDT::Orient,"Orient"},
Expand Down
4 changes: 2 additions & 2 deletions MMVII/src/SysCo/CreateRTL.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,8 @@ cSpecMMVII_Appli TheSpec_CreateRTL
Alloc_CreateRTL,
"Create RTL (local tangent repair)",
{eApF::SysCo},
{eApDT::GndPt3D,eApDT::Ori,eApDT::SysCo},
{eApDT::GndPt3D,eApDT::Ori,eApDT::SysCo},
{eApDT::ObjCoordWorld,eApDT::Ori,eApDT::SysCo},
{eApDT::ObjCoordWorld,eApDT::Ori,eApDT::SysCo},
__FILE__
);

Expand Down
4 changes: 2 additions & 2 deletions MMVII/src/SysCo/TestProj.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ cSpecMMVII_Appli TheSpec_TestProj
Alloc_TestProj,
"Test Proj",
{eApF::SysCo},
{eApDT::GndPt3D,eApDT::SysCo},
{eApDT::GndPt3D,eApDT::SysCo},
{eApDT::ObjCoordWorld,eApDT::SysCo},
{eApDT::ObjCoordWorld,eApDT::SysCo},
__FILE__
);

Expand Down

0 comments on commit 5ab7080

Please sign in to comment.