Skip to content

Commit

Permalink
SysCoProj => SysCo
Browse files Browse the repository at this point in the history
  • Loading branch information
@jmmuller
jmmuller committed May 6, 2024
1 parent 5e7c4d6 commit ce173f6
Show file tree
Hide file tree
Showing 14 changed files with 98 additions and 111 deletions.
49 changes: 24 additions & 25 deletions MMVII/include/MMVII_Sensor.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "MMVII_Geom2D.h"
#include "MMVII_Geom3D.h"
#include "MMVII_DeclareCste.h"
#include "MMVII_SysCoProj.h"
#include "MMVII_SysCo.h"


using namespace NS_SymbolicDerivative;
Expand Down Expand Up @@ -459,7 +459,6 @@ class cPhotogrammetricProject
tPtrArg2007 ArgChSys(bool DefaultUndefined=false);
/// To fix the "cur" sys co, its In,Out, or InOut, if both and diff use ArgChSys
tPtrArg2007 ArgSysCo();
tPtrArg2007 ArgSysCoProj();

//===================================================================
//================== ORIENTATION =============================
Expand Down Expand Up @@ -633,38 +632,38 @@ class cPhotogrammetricProject
//===================================================================

// ======== [1] Sysco saved in "MMVII-PhgrProj/SysCo"
void SaveSysCoProj(tPtrSysCo,const std::string&,bool OnlyIfNew=false) const;
tPtrSysCo ReadSysCoProj(const std::string &aName) const;
void SaveSysCo(tPtrSysCo,const std::string&,bool OnlyIfNew=false) const;
tPtrSysCo ReadSysCo(const std::string &aName) const;


tPtrSysCo CreateSysCoRTL(const cPt3dr & aOrig,const std::string &aNameRef,bool SVP=false) const;
std::string FullNameSysCo(const std::string &aName,bool SVP=false) const;

// return identity if Vec not init
cMmCRS2CRS ChangSysProj(const std::vector<std::string> &,tREAL8 aEpsDif=0.1);
cMmCRS2CRS ChangSysCo(const std::vector<std::string> &,tREAL8 aEpsDif=0.1);
// Return idenitity if aS1==aS2
cMmCRS2CRS ChangSysProj(const std::string aS1,const std::string aS2) const;
cMmCRS2CRS ChangSysCo(const std::string aS1,const std::string aS2) const;

// ======== [1] Sysco saved in "MMVII-PhgrProj/Ori/" or "MMVII-PhgrProj/PointsMeasure//"
std::string NameCurSysCo(const cDirsPhProj &,bool IsIn) const;
tPtrSysCo CurSysCoProj(const cDirsPhProj &,bool SVP=false) const;
tPtrSysCo CurSysCoProjOri(bool SVP=false) const;
tPtrSysCo CurSysCoProjGCP(bool SVP=false) const;
void SaveCurSysCoProj(const cDirsPhProj &,tPtrSysCo) const ;
void SaveCurSysCoProjOri(tPtrSysCo) const ;
void SaveCurSysCoProjGCP(tPtrSysCo) const ;
void SaveStdCurSysCoProj(bool IsOri) const; /// save the Cur Sysco in Orient/GCP
tPtrSysCo CurSysCo(const cDirsPhProj &,bool SVP=false) const;
tPtrSysCo CurSysCoOri(bool SVP=false) const;
tPtrSysCo CurSysCoGCP(bool SVP=false) const;
void SaveCurSysCo(const cDirsPhProj &,tPtrSysCo) const ;
void SaveCurSysCoOri(tPtrSysCo) const ;
void SaveCurSysCoGCP(tPtrSysCo) const ;
void SaveStdCurSysCo(bool IsOri) const; /// save the Cur Sysco in Orient/GCP
void CpSysIn2Out(bool OriIn,bool OriOut) const; // bool : Ori/GCP do it only if exist, else no error

const cMmCRS2CRS & ChSysProj() const;
cMmCRS2CRS & ChSysProj() ;
bool ChSysProjIsInit() const;
void AssertChSysProjIsInit() const;
const cMmCRS2CRS & ChSysCo() const;
cMmCRS2CRS & ChSysCo() ;
bool ChSysCoIsInit() const;
void AssertChSysCoIsInit() const;

cSysCo & SysCoProj() ;
const cSysCo & SysCoProj() const ;
bool SysCoProjIsInit() const;
void AssertSysCoProjIsInit() const;
cSysCo & SysCo() ;
const cSysCo & SysCo() const ;
bool SysCoIsInit() const;
void AssertSysCoIsInit() const;

//===================================================================
//================== Clinometers ========================
Expand Down Expand Up @@ -707,11 +706,11 @@ class cPhotogrammetricProject
std::string mDirVisu;

std::string mDirSysCo; /// Folder where are stored System of coordinates
std::string mNameCurSysCoProj; /// Data where we store the system In Or Out if given in std args
tPtrSysCo mCurSysCoProj; /// Global coord sys
std::string mNameCurSysCo; /// Data where we store the system In Or Out if given in std args
tPtrSysCo mCurSysCo; /// Global coord sys
std::string mDirImportInitOri; /// Folder where are stored INIT-al ORI-entation
std::vector<std::string> mNameChSys;
cMmCRS2CRS mChSysProj;
std::vector<std::string> mNameChSysCo;
cMmCRS2CRS mChSysCo;

cDirsPhProj mDPOrient;
cDirsPhProj mDPRadiomData;
Expand Down
12 changes: 3 additions & 9 deletions MMVII/include/MMVII_SysCoProj.h → MMVII/include/MMVII_SysCo.h
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,10 @@
#ifndef _MMVII_SYSCOPROJ_H_
#define _MMVII_SYSCOPROJ_H_
#ifndef _MMVII_SYSCO_H_
#define _MMVII_SYSCO_H_

#include "MMVII_DeclareCste.h"
#include "MMVII_Mappings.h"
#include "MMVII_AllClassDeclare.h"

/**
\file SysCoProj.cpp
\brief calls libProj
*/


namespace MMVII
{
Expand Down Expand Up @@ -93,4 +87,4 @@ class cMmCRS2CRS : public cDataInvertibleMapping<tREAL8,3>

}; // MMVII

#endif // _MMVII_SYSCOPROJ_H_
#endif // _MMVII_SYSCO_H_
4 changes: 2 additions & 2 deletions MMVII/src/ConvertFormat/ImportGCP.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ int cAppli_ImportGCP::Exe()
mNameGCP = LastPrefix(mNameGCP);
}

cMmCRS2CRS & aChSys = mPhProj.ChSysProj();
cMmCRS2CRS & aChSys = mPhProj.ChSysCo();

cSetMesGCP aSetM(mNameGCP);

Expand Down Expand Up @@ -134,7 +134,7 @@ int cAppli_ImportGCP::Exe()
}

mPhProj.SaveGCP(aSetM);
mPhProj.SaveCurSysCoProjGCP(aChSys.SysTarget());
mPhProj.SaveCurSysCoGCP(aChSys.SysTarget());


return EXIT_SUCCESS;
Expand Down
6 changes: 3 additions & 3 deletions MMVII/src/ConvertFormat/ImportMes32.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ cCollecSpecArg2007 & cAppli_ImportM32::ArgOpt(cCollecSpecArg2007 & anArgObl)
<< AOpt2007(mNameGCP,"NameGCP","Name for set of GCP",{eTA2007::HDV})
<< AOpt2007(mNameImage,"NameIm","Name for Image",{eTA2007::HDV})
<< AOpt2007(mAddIm2NamePt,"AddI2NameP","Add name of image to name of pt",{eTA2007::HDV})
<< mPhProj.ArgSysCoProj()
<< mPhProj.ArgSysCo()
;
}

Expand Down Expand Up @@ -120,8 +120,8 @@ int cAppli_ImportM32::Exe()
mPhProj.SaveGCP(aSetGCP);
mPhProj.SaveMeasureIm(aSetIm);

if (mPhProj.SysCoProjIsInit())
mPhProj.SaveStdCurSysCoProj(false);
if (mPhProj.SysCoIsInit())
mPhProj.SaveStdCurSysCo(false);

return EXIT_SUCCESS;
}
Expand Down
2 changes: 1 addition & 1 deletion MMVII/src/ConvertFormat/ImportOri.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ int cAppli_ImportOri::Exe()
{
mPhProj.FinishInit();
if (IsInit(&mSysCo))
mPhProj.SaveCurSysCoProjOri(mPhProj.ReadSysCoProj(mSysCo));
mPhProj.SaveCurSysCoOri(mPhProj.ReadSysCo(mSysCo));

std::vector<std::vector<std::string>> aVNames;
std::vector<std::vector<double>> aVNums;
Expand Down
2 changes: 1 addition & 1 deletion MMVII/src/Sensors/cChangCoSensor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ std::string cChSysSensImage::V_PrefixName() const {return StaticPrefixName();}

void cChSysSensImage::FinishInit(const cPhotogrammetricProject & aPhProj)
{
mChSys = new cMmCRS2CRS(aPhProj.ChangSysProj(mSysCoOri,GetCoordinateSystem()));
mChSys = new cMmCRS2CRS(aPhProj.ChangSysCo(mSysCoOri,GetCoordinateSystem()));
cSensorImage* aSensor = aPhProj.ReadSensorFromFolder(mDirSensInit,mNameImage,true,false);
cChangCoordSensImage::CCSI_SetSensorAndMap(aSensor,mChSys,false /*DeleteSens*/);
}
Expand Down
2 changes: 1 addition & 1 deletion MMVII/src/Sensors/cExternalSensor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ void cAppliImportInitialExternSensor::ImportOneImage(const std::string & aNameI
SetIfNotInit(mSysCoordOri,aSensorInit->GetCoordinateSystem());
}

mPhProj.SaveCurSysCoProjOri(mPhProj.ReadSysCoProj(mSysCoordOri));
mPhProj.SaveCurSysCoOri(mPhProj.ReadSysCo(mSysCoordOri));

// Encapsulate this initial sensor with eventually coefficient
cSensorImage * aSensorEnd = new cExternalSensor(anAnalyse.mData,aNameIm,aSensorInit,mSysCoordOri);
Expand Down
84 changes: 42 additions & 42 deletions MMVII/src/Sensors/cPHP_SysCo.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,22 +26,22 @@ namespace MMVII

// ---------------- ChSys ---------------------------

const cMmCRS2CRS & cPhotogrammetricProject::ChSysProj() const
const cMmCRS2CRS & cPhotogrammetricProject::ChSysCo() const
{
AssertChSysProjIsInit();
return mChSysProj;
AssertChSysCoIsInit();
return mChSysCo;
}

cMmCRS2CRS & cPhotogrammetricProject::ChSysProj()
cMmCRS2CRS & cPhotogrammetricProject::ChSysCo()
{
AssertChSysProjIsInit();
return mChSysProj;
AssertChSysCoIsInit();
return mChSysCo;
}

bool cPhotogrammetricProject::ChSysProjIsInit() const { return mAppli.IsInit(&mNameChSys); }
void cPhotogrammetricProject::AssertChSysProjIsInit() const
bool cPhotogrammetricProject::ChSysCoIsInit() const { return mAppli.IsInit(&mNameChSysCo); }
void cPhotogrammetricProject::AssertChSysCoIsInit() const
{
MMVII_INTERNAL_ASSERT_strong(ChSysProjIsInit(),"Chang coord system is not init");
MMVII_INTERNAL_ASSERT_strong(ChSysCoIsInit(),"Chang coord system is not init");
}


Expand All @@ -53,30 +53,30 @@ tPtrArg2007 cPhotogrammetricProject::ArgChSys(bool DefaultUndefined)
if (DefaultUndefined)
{
aVOpt.push_back(eTA2007::HDV);
mAppli.SetVarInit(&mNameChSys);
mNameChSys = {"Local"+MMVII_NONE};
mAppli.SetVarInit(&mNameChSysCo);
mNameChSysCo = {"Local"+MMVII_NONE};
}
return AOpt2007(mNameChSys,"ChSys","Change coordinate system, if 1 Sys In=Out",aVOpt);
return AOpt2007(mNameChSysCo,"ChSys","Change coordinate system, if 1 Sys In=Out",aVOpt);
}


void cPhotogrammetricProject::AssertSysCoProjIsInit() const { MMVII_INTERNAL_ASSERT_strong(SysCoProjIsInit(),"Chang coord system is not init"); }
bool cPhotogrammetricProject::SysCoProjIsInit () const { return IsInit(&mNameCurSysCoProj); }
void cPhotogrammetricProject::AssertSysCoIsInit() const { MMVII_INTERNAL_ASSERT_strong(SysCoIsInit(),"Chang coord system is not init"); }
bool cPhotogrammetricProject::SysCoIsInit () const { return IsInit(&mNameCurSysCo); }

cSysCo & cPhotogrammetricProject::SysCoProj()
cSysCo & cPhotogrammetricProject::SysCo()
{
AssertSysCoProjIsInit();
return *mCurSysCoProj;
AssertSysCoIsInit();
return *mCurSysCo;
}
const cSysCo & cPhotogrammetricProject::SysCoProj() const
const cSysCo & cPhotogrammetricProject::SysCo() const
{
AssertSysCoProjIsInit();
return *mCurSysCoProj;
AssertSysCoIsInit();
return *mCurSysCo;
}

tPtrArg2007 cPhotogrammetricProject::ArgSysCoProj()
tPtrArg2007 cPhotogrammetricProject::ArgSysCo()
{
return AOpt2007(mNameCurSysCoProj,"SysCoProj","Name of coordinate system");
return AOpt2007(mNameCurSysCo,"SysCo","Name of coordinate system");
}

/*
Expand All @@ -102,7 +102,7 @@ std::string cPhotogrammetricProject::FullNameSysCo(const std::string &aName,boo
return aName;
}

void cPhotogrammetricProject::SaveSysCoProj(tPtrSysCo aSys,const std::string& aName,bool OnlyIfNew) const
void cPhotogrammetricProject::SaveSysCo(tPtrSysCo aSys,const std::string& aName,bool OnlyIfNew) const
{
std::string aFullName = mDirSysCo + aName + "."+ GlobTaggedNameDefSerial();

Expand All @@ -111,7 +111,7 @@ void cPhotogrammetricProject::SaveSysCoProj(tPtrSysCo aSys,const std::string& a
SaveInFile(aSys->toSysCoData(), aFullName);
}

tPtrSysCo cPhotogrammetricProject::ReadSysCoProj(const std::string &aName) const
tPtrSysCo cPhotogrammetricProject::ReadSysCo(const std::string &aName) const
{
// compute name
std::string aNameGlob = FullNameSysCo(aName,true);
Expand All @@ -126,28 +126,28 @@ tPtrSysCo cPhotogrammetricProject::CreateSysCoRTL(const cPt3dr & aOrig,const std
{
std::string aNameFull = FullNameSysCo(aNameRef,SVP);
//if (aNameFull=="")
// return tPtrSysCoProj(nullptr);
// return tPtrSysCo(nullptr);

return cSysCo::makeRTL(aOrig,aNameFull);
}



cMmCRS2CRS cPhotogrammetricProject::ChangSysProj(const std::string aS1,const std::string aS2) const
cMmCRS2CRS cPhotogrammetricProject::ChangSysCo(const std::string aS1,const std::string aS2) const
{
if (aS1==aS2)
return cMmCRS2CRS{};
return cMmCRS2CRS(ReadSysCoProj(aS1),ReadSysCoProj(aS2));
return cMmCRS2CRS(ReadSysCo(aS1),ReadSysCo(aS2));
}

cMmCRS2CRS cPhotogrammetricProject::ChangSysProj(const std::vector<std::string> & aVec,tREAL8 aEpsDif)
cMmCRS2CRS cPhotogrammetricProject::ChangSysCo(const std::vector<std::string> & aVec,tREAL8 aEpsDif)
{
if (! mAppli.IsInit(&aVec)) return cMmCRS2CRS{};

if (aVec.size() == 1)
return cMmCRS2CRS(ReadSysCoProj(aVec.at(0)),ReadSysCoProj(aVec.at(0)));
return cMmCRS2CRS(ReadSysCo(aVec.at(0)),ReadSysCo(aVec.at(0)));

return cMmCRS2CRS( ReadSysCoProj(aVec.at(0)) , ReadSysCoProj(aVec.at(1)) );
return cMmCRS2CRS( ReadSysCo(aVec.at(0)) , ReadSysCo(aVec.at(1)) );
}

//================== SysCo saved in standard folder ============
Expand All @@ -158,7 +158,7 @@ std::string cPhotogrammetricProject::NameCurSysCo(const cDirsPhProj & aDP,bool

}

tPtrSysCo cPhotogrammetricProject::CurSysCoProj(const cDirsPhProj & aDP,bool SVP) const
tPtrSysCo cPhotogrammetricProject::CurSysCo(const cDirsPhProj & aDP,bool SVP) const
{
std::string aPath = NameCurSysCo(aDP,true);
if (! ExistFile(aPath))
Expand All @@ -172,39 +172,39 @@ tPtrSysCo cPhotogrammetricProject::CurSysCoProj(const cDirsPhProj & aDP,bool SV
}


tPtrSysCo cPhotogrammetricProject::CurSysCoProjOri(bool SVP) const {return CurSysCoProj(mDPOrient,SVP);}
tPtrSysCo cPhotogrammetricProject::CurSysCoProjGCP(bool SVP) const {return CurSysCoProj(mDPPointsMeasures,SVP);}
tPtrSysCo cPhotogrammetricProject::CurSysCoOri(bool SVP) const {return CurSysCo(mDPOrient,SVP);}
tPtrSysCo cPhotogrammetricProject::CurSysCoGCP(bool SVP) const {return CurSysCo(mDPPointsMeasures,SVP);}

void cPhotogrammetricProject::SaveCurSysCoProj(const cDirsPhProj & aDP,tPtrSysCo aSysCo) const
void cPhotogrammetricProject::SaveCurSysCo(const cDirsPhProj & aDP,tPtrSysCo aSysCo) const
{
SaveInFile(aSysCo->toSysCoData(),NameCurSysCo(aDP,false));
}


void cPhotogrammetricProject::SaveCurSysCoProjOri(tPtrSysCo aSysCo) const { SaveCurSysCoProj(mDPOrient,aSysCo); }
void cPhotogrammetricProject::SaveCurSysCoProjGCP(tPtrSysCo aSysCo) const { SaveCurSysCoProj(mDPPointsMeasures,aSysCo); }
void cPhotogrammetricProject::SaveCurSysCoOri(tPtrSysCo aSysCo) const { SaveCurSysCo(mDPOrient,aSysCo); }
void cPhotogrammetricProject::SaveCurSysCoGCP(tPtrSysCo aSysCo) const { SaveCurSysCo(mDPPointsMeasures,aSysCo); }

void cPhotogrammetricProject::SaveStdCurSysCoProj(bool IsOri) const
void cPhotogrammetricProject::SaveStdCurSysCo(bool IsOri) const
{
AssertSysCoProjIsInit();
SaveCurSysCoProj((IsOri ? mDPOrient : mDPPointsMeasures),mCurSysCoProj);
AssertSysCoIsInit();
SaveCurSysCo((IsOri ? mDPOrient : mDPPointsMeasures),mCurSysCo);
}


void cPhotogrammetricProject::CpSysIn2Out(bool OriIn,bool OriOut) const
{
StdOut() << "ENTER_CpSysIn2Out\n";
tPtrSysCo aSysIn = OriIn ? CurSysCoProjOri(true) : CurSysCoProjGCP(true);
tPtrSysCo aSysIn = OriIn ? CurSysCoOri(true) : CurSysCoGCP(true);

StdOut() << "CpSysIn2OutCpSysIn2Out " << OriIn << " " << OriOut << " PTR=" << aSysIn.get() << "\n";

if (aSysIn.get() == nullptr)
return;

if (OriOut)
SaveCurSysCoProjOri(aSysIn);
SaveCurSysCoOri(aSysIn);
else
SaveCurSysCoProjGCP(aSysIn);
SaveCurSysCoGCP(aSysIn);
}


Expand Down
Loading

0 comments on commit ce173f6

Please sign in to comment.