Export data in csv

micmacIGN · Nov 28, 2024 · df39a72 · df39a72
1 parent ee68cbc
commit df39a72
Show file tree

Hide file tree

Showing 28 changed files with 200 additions and 132 deletions.
diff --git a/MMVII/git_help_mpd.txt b/MMVII/git_help_mpd.txt
@@ -1,3 +1,7 @@
+export MMVII_USE_MMV1_IMAGE=1
+export MMVII_USE_MMV1_IMAGE=0
+
+=====================================================
 git config core.editor vim
 
 git fetch origin

diff --git a/MMVII/include/MMVII_2Include_CSV_Serial_Tpl.h b/MMVII/include/MMVII_2Include_CSV_Serial_Tpl.h
@@ -158,8 +158,8 @@ template <class Type> void FromCSV(std::vector<Type>& aVect,const std::string &
 //======================================================================================
 template <class Type> void Tpl_AddHeaderReportCSV(cMMVII_Appli & anAppli,const std::string & anId,bool IsMul)
 {
-    anAppli.InitReport(anId,"csv",IsMul,{});
-    if (anAppli.LevelCall()==0)
+    anAppli.InitReportCSV(anId,"csv",IsMul,{});
+    if ((anAppli.LevelCall()==0) || (!IsMul))
     {
          std::string aNameFile = anAppli.NameFileCSVReport(anId);
          cOCSVFile<Type>(aNameFile,true); // true with header

diff --git a/MMVII/include/MMVII_Error.h b/MMVII/include/MMVII_Error.h
@@ -33,8 +33,8 @@ namespace MMVII
 
 // extern int  The_MMVII_DebugLevel = The_MMVII_DebugLevel_InternalError_medium;
 //#define The_MMVII_DebugLevel The_MMVII_DebugLevel_BenchError
+// #define The_MMVII_DebugLevel The_MMVII_DebugLevel_InternalError_tiny
 #define The_MMVII_DebugLevel The_MMVII_DebugLevel_InternalError_tiny
-// #define The_MMVII_DebugLevel The_MMVII_DebugLevel_BenchError
 // #define The_MMVII_DebugLevel The_MMVII_DebugLevel_UserError
 
 /**  The error handler can be change , so its a function Ptr of type PtrMMVII_Error_Handler,

diff --git a/MMVII/include/MMVII_MeasuresIm.h b/MMVII/include/MMVII_MeasuresIm.h
@@ -87,6 +87,7 @@ class cMesIm1Pt
         std::string       mNamePt;
         cArray<tREAL4,3>  mSigma2;  // xx xy yy
 };
+void AddData(const  cAuxAr2007 & anAux,cMesIm1Pt & aGCPMI);
 
 /** class for representing a set of measure in an image*/
 class cSetMesPtOf1Im : public cMemCheck
@@ -96,6 +97,8 @@ class cSetMesPtOf1Im : public cMemCheck
           cSetMesPtOf1Im();
 	  static cSetMesPtOf1Im  FromFile(const std::string & aNameFile);
           void AddMeasure(const cMesIm1Pt &);
+          /// Add a measure only if name is new, if not test if dist < tol if not ->error
+          void AddMeasureIfNew(const cMesIm1Pt &,tREAL8 aTol=-1);
           void AddData(const  cAuxAr2007 & anAux);
           void SortMes(); // sort measures in place with NamePt
 

diff --git a/MMVII/include/cMMVII_Appli.h b/MMVII/include/cMMVII_Appli.h
@@ -231,6 +231,7 @@ class cTimerSegm
        ~cTimerSegm();
        /// Force to have no show at del, usefull for handling parameter in bench
        void SetNoShowAtDel();
+       double  CurBeginTime() const ; ///< Accessor
    private :
        tTableIndTS          mTimers;
        tIndTS               mLastIndex;
@@ -395,6 +396,16 @@ enum class eModeCall
               eMulSubP
            };
 
+struct  cAttrReport
+{
+    public :
+        std::string    mPost;
+        std::string    mFile;
+        std::string    mDirRedirect;
+        bool           mIsMul;
+        bool           m2Merge;
+};
+
 
 class cMMVII_Appli : public cMMVII_Ap_NameManip,
                      public cMMVII_Ap_CPU
@@ -540,7 +551,7 @@ class cMMVII_Appli : public cMMVII_Ap_NameManip,
 	virtual void OnCloseReport(int aNbLine,const std::string & anIdent,const std::string & aNameFile) const;
 
         /// Generate a new entry for report "anId",  IsMul -> indicate if we are in multi process (for merge at end)
-	void  InitReport(const std::string &anId,const std::string & aPostfix,bool IsMul,const std::vector<std::string> & aHeader={});
+	void  InitReportCSV(const std::string &anId,const std::string & aPostfix,bool IsMul,const std::vector<std::string> & aHeader={});
 	//  void  AddTopReport(const std::string &anId,const std::string & VecMsg);
 
 
@@ -734,11 +745,11 @@ class cMMVII_Appli : public cMMVII_Ap_NameManip,
         bool                                      mIsInBenchMode;   ///< is the command executed for bench (will probably make specific test)
 
 	char                               mCSVSep;    ///< separator in csv file, for now hard coded to ","
-	std::map<std::string,std::string>  mMapIdFilesReport; ///< For a given id memorize the post fix, as "csv"
-	std::map<std::string,std::string>  mMapIdPostReport; ///< For a given id , memorize the file (Global of Tmp in sub process)
+	std::map<std::string,cAttrReport>  mMapAttrReport; ///< For a given id memorize the post fix, as "csv"
+	// std::map<std::string,std::pair<bool,std::string>>  mMapIdPostReport; ///< For a given id , memorize IsMul + Post
         /// If finally, we want to store finall result is another Dir (when report is used for generating data in csv as export)
-	std::map<std::string,std::string>  mMapIdRedirect; 
-	std::set<std::string>              mReport2Merge;  ///< Memorize all the report identifier that must be merged
+	// std::map<std::string,std::string>  mMapIdRedirect; 
+	// std::set<std::string>              mReport2Merge;  ///< Memorize all the report identifier that must be merged
         std::string                        mReportSubDir;  ///< In case we want to write in separate subdir (like with GCP)
 
 	std::string                        mPatternInitGMA;

diff --git a/MMVII/src/Appli/cMMVII_Ap_CPU.cpp b/MMVII/src/Appli/cMMVII_Ap_CPU.cpp
@@ -137,6 +137,8 @@ cTimerSegm::cTimerSegm(cMMVII_Ap_CPU * anAppli) :
 {
 }
 
+double cTimerSegm::CurBeginTime() const {return  mCurBeginTime;}
+
 void  cTimerSegm::SetNoShowAtDel()
 {
     mShowAtDel = false;

diff --git a/MMVII/src/Appli/cMMVII_Appli.cpp b/MMVII/src/Appli/cMMVII_Appli.cpp
@@ -1150,7 +1150,10 @@ void cMMVII_Appli::LogCommandOut(const std::string & aName,bool MainLogFile)
       return;
    cMMVII_Ofs  aOfs(aName,eFileModeOut::AppendText);
    // Add id, if several process were throw in // there is a mix and we no longer know which was closed
-   aOfs.Ofs() << "  ending correctly at : " <<  StrDateCur()  << " (Id=" << mPrefixNameAppli << ")\n\n";
+   aOfs.Ofs() << "  ending correctly at : " <<  StrDateCur()  
+              << " Time=" << SecFromT0() - TimeSegm().CurBeginTime()
+              << " TTT=" << SecFromT0() 
+              << " (Id=" << mPrefixNameAppli << ")\n\n";
    aOfs.Ofs().close();
 }
 

diff --git a/MMVII/src/Appli/cMMVII_Appli_MakeReport.cpp b/MMVII/src/Appli/cMMVII_Appli_MakeReport.cpp
@@ -28,7 +28,7 @@ void cMMVII_Appli::SetReportSubDir(const std::string & aSubDir)
 void  cMMVII_Appli::SetReportRedir(const std::string &anId,const std::string & aNewDir)
 {
     CreateDirectories(aNewDir,false);
-    mMapIdRedirect[anId] = aNewDir;
+    mMapAttrReport[anId].mDirRedirect  = aNewDir;
 }
 
 
@@ -38,41 +38,40 @@ std::string  cMMVII_Appli::DirSubPReport(const std::string &anId)
 }
 
 
-void  cMMVII_Appli::InitReport(const std::string &anId,const std::string &aPost,bool IsMul,const std::vector<std::string> & aHeader)
+void  cMMVII_Appli::InitReportCSV(const std::string &anId,const std::string &aPost,bool IsMul,const std::vector<std::string> & aHeader)
 {
-    if (IsMul && (LevelCall()==0))
-    {
-       mReport2Merge.insert(anId);
-    }
+    cAttrReport & anAttr = mMapAttrReport[anId];
+    anAttr.mIsMul = IsMul;
+    anAttr.m2Merge = IsMul && (LevelCall()==0);
+    anAttr.mPost = aPost;
 
-    if (LevelCall()==0)
+    if ((LevelCall()==0) || (!IsMul))
     {
          CreateDirectories(DirReport(),true);
-	 mMapIdFilesReport[anId] = DirReport()+anId + "." + aPost;
+         anAttr.mFile = DirReport()+anId + "." + aPost;
 	 if (IsMul)
             CreateDirectories(DirSubPReport(anId),true);
     }
     else if (LevelCall()==1)
     {
-        mMapIdFilesReport[anId]  = DirSubPReport(anId) + FileOfPath(UniqueStr(0),false)  +"." + aPost;
+        anAttr.mFile = DirSubPReport(anId) + FileOfPath(UniqueStr(0),false)  +"." + aPost;
     }
     else
         return;
-    mMapIdPostReport[anId] = aPost;
 
-    cMMVII_Ofs(mMapIdFilesReport[anId], eFileModeOut::CreateText);
+    cMMVII_Ofs(anAttr.mFile, eFileModeOut::CreateText);
 
     if (! aHeader.empty())
        AddHeaderReportCSV(anId,aHeader);
 }
 
 const std::string& cMMVII_Appli::NameFileCSVReport(const std::string & anId) const
 {
-     auto anIt = mMapIdFilesReport.find(anId);
+     auto anIt = mMapAttrReport.find(anId);
 
-     MMVII_INTERNAL_ASSERT_tiny(anIt!=mMapIdPostReport.end(),"NameFileCSVReport for Id=" + anId);
+     MMVII_INTERNAL_ASSERT_tiny(anIt!=mMapAttrReport.end(),"NameFileCSVReport for Id=" + anId);
 
-     return anIt->second;
+     return anIt->second.mFile;
 }
 
 /*
@@ -87,8 +86,7 @@ void  cMMVII_Appli::AddTopReport(const std::string &anId,const std::string & aMs
 
 void  cMMVII_Appli::AddOneReport(const std::string &anId,const std::string & aMsg)
 {
-    std::string  aName = mMapIdFilesReport[anId];
-    MMVII_INTERNAL_ASSERT_tiny(aName!="","No file in AddOneMesCSV");
+    std::string  aName = NameFileCSVReport(anId);
     cMMVII_Ofs aFile(aName, eFileModeOut::AppendText);
 
     aFile.Ofs() << aMsg;
@@ -148,24 +146,22 @@ void  cMMVII_Appli:: AddStdStatCSV(const std::string &anId,const std::string & a
 }
 
 
-
 void  cMMVII_Appli::DoMergeReport()
 {
-     for (const auto & anIt : mMapIdFilesReport)
+     for (const auto & [anId,anAttr] : mMapAttrReport)
      {
-        if (BoolFind(mReport2Merge,anIt.first))
+        if (anAttr.m2Merge)
 	{
 	     int aNbLines = 0;
              // Put aFileGlob in {} to create destruction before OnCloseReport that may generat error
              {
-                 cMMVII_Ofs aFileGlob(anIt.second, eFileModeOut::AppendText);
-                 const std::string & anId = anIt.first;
+                 cMMVII_Ofs aFileGlob(anAttr.mFile, eFileModeOut::AppendText);
 
 	         if (mRMSWasUsed)
 	         {
 	            for (const auto & aNameIm : VectMainSet(0))
 	            {
-                        std::string aNameIn = DirSubPReport(anId) + FileOfPath(aNameIm,false) + "." + mMapIdPostReport[anId];
+                        std::string aNameIn = DirSubPReport(anId) + FileOfPath(aNameIm,false) + "." + anAttr.mPost;
 	                cMMVII_Ifs aIn(aNameIn, eFileModeIn::Text);
 
 	                std::string aLine;
@@ -179,16 +175,23 @@ void  cMMVII_Appli::DoMergeReport()
                  RemoveRecurs(DirSubPReport(anId),false,false);
 
              }
-	     OnCloseReport(aNbLines,anIt.first,anIt.second);
+	     OnCloseReport(aNbLines,anId,anAttr.mFile);
 	}
-        if (MapBoolFind(mMapIdRedirect,anIt.first) && (LevelCall()==0))
+/*
+if (MapBoolFind(mMapIdRedirect,anIt.first))
+{
+StdOut() <<  "WWftR78::: " <<   anIt.second << " => " <<   mMapIdRedirect[anIt.first] + FileOfPath(anIt.second) << "\n";
+}
+*/
+        if ( (anAttr.mDirRedirect!="")  && ( (LevelCall()==0) || (! anAttr.mIsMul)))
         {
-            std::string aNewFile = mMapIdRedirect[anIt.first] + FileOfPath(anIt.second);
-            RenameFiles(anIt.second,aNewFile);
+            std::string aNewFile = anAttr.mDirRedirect + FileOfPath(anAttr.mFile);
+            RenameFiles(anAttr.mFile,aNewFile);
         }
      }
 }
 
+
 // By default nothing to do
 void  cMMVII_Appli::OnCloseReport(int aNbLine,const std::string & anIdent,const std::string & aNameFile) const
 {

diff --git a/MMVII/src/CodedTarget/cCheckBoardTargetExtract.cpp b/MMVII/src/CodedTarget/cCheckBoardTargetExtract.cpp
@@ -557,7 +557,9 @@ void  cAppliCheckBoardTargetExtract::DoExport()
          if (aCdtM.Code())
          {
              std::string aCode = aCdtM.Code()->Name() ;
-             aSetM.AddMeasure(cMesIm1Pt(aCdtM.mC0,aCode,1.0));
+             cMesIm1Pt aMesIm(aCdtM.mC0,aCode,1.0);
+             aSetM.AddMeasure(aMesIm);
+             Tpl_AddOneObjReportCSV(*this,mIdExportCSV,aMesIm);
          }
      }
 
@@ -567,6 +569,14 @@ void  cAppliCheckBoardTargetExtract::DoExport()
 
 void cAppliCheckBoardTargetExtract::DoOneImage() 
 {
+   mIdExportCSV       = "CheckBoardCodedTarget-" + mNameIm;
+   //  Create a report with header computed from type
+   Tpl_AddHeaderReportCSV<cMesIm1Pt>(*this,mIdExportCSV,false);
+   // Redirect the reports on folder of result
+   SetReportRedir(mIdExportCSV,mPhProj.DPPointsMeasures().FullDirOut());
+
+
+
     mInterpol = new   cTabulatedDiffInterpolator(cSinCApodInterpolator(5.0,5.0));
 
     mSpecif = cFullSpecifTarget::CreateFromFile(mNameSpecif);
@@ -707,6 +717,8 @@ int  cAppliCheckBoardTargetExtract::Exe()
 {
    mPhProj.FinishInit();
 
+
+
    if (RunMultiSet(0,0))
    {
        return ResultMultiSet();

diff --git a/MMVII/src/CodedTarget/cCheckBoardTargetExtract.h b/MMVII/src/CodedTarget/cCheckBoardTargetExtract.h
@@ -384,6 +384,7 @@ class cAppliCheckBoardTargetExtract : public cMMVII_Appli
 	tREAL8                mCurScale;    /// Memorize the current value of the scale
 	bool                  mMainScale;   /// Is it the first/main scale 
 	cDiffInterpolator1D * mInterpol;
+        std::string           mIdExportCSV;  /// Identifier for handling result as CSV-files
 };
 
 

diff --git a/MMVII/src/CodedTarget/cCircTargetExtract.cpp b/MMVII/src/CodedTarget/cCircTargetExtract.cpp
@@ -774,6 +774,7 @@ class cAppliExtractCircTarget : public cMMVII_Appli,
 
 	tREAL8                              mStepRefineGrad;
         cDiffInterpolator1D *               mInterpol;
+        std::string                         mIdExportCSV;
 };
 
 
@@ -847,8 +848,14 @@ void cAppliExtractCircTarget::DoExport()
          if (anEE->mCardDetect==1)
 	 {
              std::string aCode = anEE->mWithCode ?  anEE->mEncode.Name() : (MMVII_NONE +"_" + ToStr(aCptUnCoded,mSpec->NbBits()));
-             aSetM.AddMeasure(cMesIm1Pt(anEE->mPt,aCode,1.0));
-             mVSavE.push_back(cSaveExtrEllipe(*anEE,aCode));
+             cMesIm1Pt aMesIm(anEE->mPt,aCode,1.0);
+             aSetM.AddMeasure(aMesIm);
+             Tpl_AddOneObjReportCSV(*this,mIdExportCSV,aMesIm);
+
+             cSaveExtrEllipe anESave(*anEE,aCode);
+
+             mVSavE.push_back(anESave);
+
 
 	     if (! anEE->mWithCode) aCptUnCoded++;
 	 }
@@ -861,6 +868,8 @@ void cAppliExtractCircTarget::DoExport()
      SaveInFile(mVSavE,cSaveExtrEllipe::NameFile(mPhProj,aSetM,false));
 }
 
+
+
 void cAppliExtractCircTarget::MakeImageSeed()
 {
    cRGBImage   aImVisu=  cRGBImage::FromFile(mNameIm,CurBoxIn());
@@ -1047,6 +1056,12 @@ void cAppliExtractCircTarget::TestOnSimul()
 
 int cAppliExtractCircTarget::ExeOnParsedBox()
 {
+   mIdExportCSV     = "CircCodedTarget" + mNameIm;
+   //  Create a report with header computed from type
+   Tpl_AddHeaderReportCSV<cMesIm1Pt>(*this,mIdExportCSV,false);
+   // Redirect the reports on folder of result
+   SetReportRedir(mIdExportCSV,mPhProj.DPPointsMeasures().FullDirOut());
+
    mInterpol = new   cTabulatedDiffInterpolator(cSinCApodInterpolator(5.0,5.0));
 
    mPBWT.mDistMinMaxLoc =  mPBWT.mMinDiam * mRatioDMML;
@@ -1200,17 +1215,17 @@ int  cAppliExtractCircTarget::Exe()
    }
 
    mReportMutipleDetec = "MultipleTarget";
-   InitReport(mReportMutipleDetec,"csv",true,{"Image","Target","Mult","x","y"});
+   InitReportCSV(mReportMutipleDetec,"csv",true,{"Image","Target","Mult","x","y"});
+
 
    if (mDoReportSimul)
    {
         mReportSimulDet   =    "SimulDetails" ;
         mReportSimulGlob  =    "SimulGlob"    ;
-        InitReport(mReportSimulDet,"csv",true);
-        InitReport(mReportSimulGlob,"csv",true);
+        InitReportCSV(mReportSimulDet,"csv",true);
+        InitReportCSV(mReportSimulGlob,"csv",true);
    }
    mNbMaxMulTargetTot =  mNbMaxMT_Init + mNbMaxMT_PerIm *  VectMainSet(0).size() ;
-StdOut() << "mNbMaxMulTargetTotmNbMaxMulTargetTotmNbMaxMulTargetTotmNbMaxMulTargetTotmNbMaxMulTargetTotmNbMaxMulTargetTot " << mNbMaxMulTargetTot << "\n";
 
 
    if (RunMultiSet(0,0))  // If a pattern was used, run in // by a recall to itself  0->Param 0->Set

diff --git a/MMVII/src/CodedTarget/cCompleteUncodeTarget.cpp b/MMVII/src/CodedTarget/cCompleteUncodeTarget.cpp
@@ -186,7 +186,7 @@ int  cAppliCompletUncodedTarget::Exe()
    mPhProj.FinishInit();
 
    mNameReportEllipse = "EllipsesDim";
-   InitReport(mNameReportEllipse,"csv",true);
+   InitReportCSV(mNameReportEllipse,"csv",true);
 
 
    AddHeaderReportCSV(mNameReportEllipse,{"Image","Pt","Ray","Ratio"});

diff --git a/MMVII/src/CodedTarget/cDistCorrectCirgTarget.cpp b/MMVII/src/CodedTarget/cDistCorrectCirgTarget.cpp
@@ -206,8 +206,8 @@ int  cAppliCorrecDistCircTarget::Exe()
    mPostfixReport  = "_Ori-"+  mPhProj.DPOrient().DirIn() +  "_Mes-"+  mPhProj.DPPointsMeasures().DirIn() ;
    mReportDetail   = "Detail-" +mPostfixReport;
    mReportIm       = "ByImage-" +mPostfixReport;
-   InitReport(mReportDetail,"csv",true);
-   InitReport(mReportIm,"csv",true);
+   InitReportCSV(mReportDetail,"csv",true);
+   InitReportCSV(mReportIm,"csv",true);
 
 
    mSaveMeasure = mPhProj.DPPointsMeasures().DirOutIsInit();