From 8618c711e7f15b7bcba19cb8670edcaeeea82c8b Mon Sep 17 00:00:00 2001 From: deseilligny Date: Tue, 24 Oct 2023 18:17:35 +0200 Subject: [PATCH] Some bug --- .../Circ-Code-Target/Info.txt | 2 +- MMVII/MMVII-UseCaseDataSet/DevlopImage/Info.txt | 2 +- MMVII/include/MMVII_Sensor.h | 2 +- MMVII/include/TreeDist.h | 15 ++++++++------- MMVII/include/cMMVII_Appli.h | 2 +- MMVII/src/ConvertFormat/ImportGCP.cpp | 2 +- MMVII/src/ConvertFormat/V1ImportGCP.cpp | 2 +- MMVII/src/Radiom/cModelRadioms.cpp | 2 +- MMVII/src/Radiom/cRadiomCreateModel.cpp | 1 - MMVII/src/Sensors/cPhotogrammetricProject.cpp | 11 +++++------ 10 files changed, 20 insertions(+), 21 deletions(-) diff --git a/MMVII/MMVII-UseCaseDataSet/Circ-Code-Target/Info.txt b/MMVII/MMVII-UseCaseDataSet/Circ-Code-Target/Info.txt index 67ae8146bb..26caa7cbc0 100644 --- a/MMVII/MMVII-UseCaseDataSet/Circ-Code-Target/Info.txt +++ b/MMVII/MMVII-UseCaseDataSet/Circ-Code-Target/Info.txt @@ -36,7 +36,7 @@ MMVII CodedTargetCircExtract ".*_Scaled.tif" CERN_Nbb14_Freq14_Hamm1_Run1000_10 # make a copy a GCP at write placecp Data-Aux/MesGCP-AICON-CERN-Pannel.xml MMVII-PhgrProj/PointsMeasure/Test/ -MMVII ImportGCP Data-Aux/Positions-3D-14bit_lookup.txt NXYZ OutPointsMeasure=Test NbDigName=3 +MMVII ImportGCP Data-Aux/Positions-3D-14bit_lookup.txt NXYZ Test NbDigName=3 # Now it works diff --git a/MMVII/MMVII-UseCaseDataSet/DevlopImage/Info.txt b/MMVII/MMVII-UseCaseDataSet/DevlopImage/Info.txt index dcbdee3f72..4391cdb02e 100644 --- a/MMVII/MMVII-UseCaseDataSet/DevlopImage/Info.txt +++ b/MMVII/MMVII-UseCaseDataSet/DevlopImage/Info.txt @@ -40,7 +40,7 @@ mm3d TiPunch C3DC_BigMac.ply Filter=0 # ========== MMVII part ======= # =================================================== -MMVII OriConvV1V2 Ori-Basc/ Basc +MMVII V1OriConv Ori-Basc/ Basc MMVII MeshCheck C3DC_BigMac_mesh.ply Out=Correc-C3DC_BigMac_mesh.ply Bin=1 diff --git a/MMVII/include/MMVII_Sensor.h b/MMVII/include/MMVII_Sensor.h index 1c0533c71a..ffd21e6ea6 100755 --- a/MMVII/include/MMVII_Sensor.h +++ b/MMVII/include/MMVII_Sensor.h @@ -328,7 +328,7 @@ class cPhotogrammetricProject void SaveCamPC(const cSensorCamPC &) const; ///< Save camera using OutPut-orientation void SaveCalibPC(const cPerspCamIntrCalib & aCalib) const; ///< Save calibration using OutPut-orientation - cSensorCamPC * ReadCamPC(const std::string &,bool ToDelete,bool SVP=false) const; ///< Create Camera using Input orientation + cSensorCamPC * ReadCamPC(const std::string &,bool ToDeleteAutom,bool SVP=false) const; ///< Create Camera using Input orientation /// Load a sensor, try different type (will add RPC , and others ?) diff --git a/MMVII/include/TreeDist.h b/MMVII/include/TreeDist.h index 98e469380d..7f2f344c2e 100755 --- a/MMVII/include/TreeDist.h +++ b/MMVII/include/TreeDist.h @@ -723,18 +723,19 @@ void cOneBenchFastTreeDist::MakeOneTest(bool Show,bool CheckDist) // ---- 1.2 generate the graph ------------- std::vector aV1; std::vector aV2; + // will be used to order randomly the CC + std::vector aVR; + for (int aK=0 ; aK aVR; - for (int aK=0 ; aK & aVArgs,const c cSpecMMVII_Appli TheSpec_ImportGCP ( - "V1ImportGCP", + "ImportGCP", Alloc_ImportGCP, "Import/Convert basic GCP file in MMVII format", {eApF::GCP}, diff --git a/MMVII/src/ConvertFormat/V1ImportGCP.cpp b/MMVII/src/ConvertFormat/V1ImportGCP.cpp index 18153683ea..1655f385c9 100644 --- a/MMVII/src/ConvertFormat/V1ImportGCP.cpp +++ b/MMVII/src/ConvertFormat/V1ImportGCP.cpp @@ -118,7 +118,7 @@ tMMVII_UnikPApli Alloc_ConvertV1V2_GCPIM(const std::vector & aVArgs cSpecMMVII_Appli TheSpec_ConvertV1V2_GCPIM ( - "ConvertGCPIm", + "V1ConvertGCPIm", Alloc_ConvertV1V2_GCPIM, "Convert Im&GCP measure from V1 to VII format", {eApF::GCP}, diff --git a/MMVII/src/Radiom/cModelRadioms.cpp b/MMVII/src/Radiom/cModelRadioms.cpp index fc92e829ab..c0616ee783 100755 --- a/MMVII/src/Radiom/cModelRadioms.cpp +++ b/MMVII/src/Radiom/cModelRadioms.cpp @@ -270,7 +270,7 @@ cCalRadIm_Pol::cCalRadIm_Pol(cCalibRadiomSensor * aCalSens,int aDegree,const st // mImaEqual = EqRadiomEqualisation(mCalibSens->NbParamRad(),mDegree,true,1); PostInit(); - StdOut() << "CPPP=" << mCoeffPol << " D=" << mDegree << std::endl; + // StdOut() << "CPPP=" << mCoeffPol << " D=" << mDegree << std::endl; } } diff --git a/MMVII/src/Radiom/cRadiomCreateModel.cpp b/MMVII/src/Radiom/cRadiomCreateModel.cpp index cccc77b16d..ff280cfef8 100755 --- a/MMVII/src/Radiom/cRadiomCreateModel.cpp +++ b/MMVII/src/Radiom/cRadiomCreateModel.cpp @@ -81,7 +81,6 @@ int cAppliCreateModelRadiom::Exe() StdOut() << "ZZZZ= " << aCRI->NameIm() << std::endl; delete aCRI; } - } return EXIT_SUCCESS; diff --git a/MMVII/src/Sensors/cPhotogrammetricProject.cpp b/MMVII/src/Sensors/cPhotogrammetricProject.cpp index bcb55c31c6..dbacfae853 100644 --- a/MMVII/src/Sensors/cPhotogrammetricProject.cpp +++ b/MMVII/src/Sensors/cPhotogrammetricProject.cpp @@ -284,8 +284,6 @@ void cPhotogrammetricProject::FinishInit() // Create an example file if none exist GenerateSampleCalcMTD(); - // StdOut() << "MTD=" << mDPMetaData.FullDirOut() << std::endl; - // StdOut() << "MTD=" << mDPMetaData.FullDirOut() << std::endl; getchar(); } cPhotogrammetricProject::~cPhotogrammetricProject() @@ -410,7 +408,7 @@ void cPhotogrammetricProject::SaveCalibPC(const cPerspCamIntrCalib & aCalib) co } -cSensorCamPC * cPhotogrammetricProject::ReadCamPC(const std::string & aNameIm,bool ToDelete,bool SVP) const +cSensorCamPC * cPhotogrammetricProject::ReadCamPC(const std::string & aNameIm,bool ToDeleteAutom,bool SVP) const { mDPOrient.AssertDirInIsInit(); @@ -420,9 +418,11 @@ cSensorCamPC * cPhotogrammetricProject::ReadCamPC(const std::string & aNameIm,bo { return nullptr; } - cSensorCamPC * aCamPC = cSensorCamPC::FromFile(aNameCam,!ToDelete); + // Modif MPD : if we want to delete it ourseff (ToDeleteAuto=false) it must not be a remanent object + // cSensorCamPC * aCamPC = cSensorCamPC::FromFile(aNameCam,!ToDelete); + cSensorCamPC * aCamPC = cSensorCamPC::FromFile(aNameCam,ToDeleteAutom); - if (ToDelete) + if (ToDeleteAutom) cMMVII_Appli::AddObj2DelAtEnd(aCamPC); @@ -468,7 +468,6 @@ cPerspCamIntrCalib * cPhotogrammetricProject::InternalCalibFromImage(const std: // * case where calib exist but not pose // * case where nor calib nor pose exist, and must be created from xif mDPOrient.AssertDirInIsInit(); - cSensorCamPC * aPC = ReadCamPC(aNameIm,false); cPerspCamIntrCalib * aCalib = aPC->InternalCalib(); delete aPC;