std::string cInterfChantierNameManipulateur::NamePackWithAutoSym
(
const std::string & aKey,
const std::string & aName1,
const std::string & aName2,
bool aSVP
)
{
std::string aN12_SsDir = Assoc1To2(aKey,aName1,aName2,true);
std::string aN12 = mDir+aN12_SsDir;
if (! ELISE_fp::exist_file(aN12))
{
std::string aN21 =mDir+ Assoc1To2(aKey,aName2,aName1,true);
if (! ELISE_fp::exist_file(aN21))
{
if (aSVP)
return aN12_SsDir;
std::cout << "For K=" << aKey
<< " N1=" << aName1
<< " N2=" << aName2 << "\n";
std::cout << aN12 << "\n";
std::cout << aN21 << "\n";
ELISE_ASSERT(false,"Ni fichier homoloque ni symetrique n'existe");
}
ElPackHomologue aPack = ElPackHomologue::FromFile(aN21);
aPack.SelfSwap();
aPack.StdPutInFile(aN12);
}
return aN12_SsDir;
}
void cModeleAnalytiqueComp::SauvHomologues(const ElPackHomologue & aPack)
{
TifSauvHomologues(aPack);
if (mModele.AutomNamesExportHomXml().IsInit())
{
AssertAutomSelExportOriIsInit(mModele);
std::string aNameXML = StdNameFromCple
(
mAutomExport,
mModele.AutomSelExportOri().Val(),
mModele.AutomNamesExportHomXml().Val(),
"@",
mAppli.PDV1()->Name(),
mAppli.PDV2()->Name()
);
cElXMLFileIn aFileXML(mAppli.FullDirResult()+aNameXML);
aFileXML.PutPackHom(aPack);
}
if (mModele.KeyNamesExportHomXml().IsInit())
{
std::string aNameXML = mAppli.ICNM()->Assoc1To2
(
mModele.KeyNamesExportHomXml().Val(),
mAppli.PDV1()->Name(),
mAppli.PDV2()->Name(),
true
);
// cElXMLFileIn aFileXML(mAppli.WorkDir()+aNameXML);
// aFileXML.PutPackHom(aPack);
aPack.StdPutInFile(mAppli.WorkDir()+aNameXML);
}
if (mModele.AutomNamesExportHomBin().IsInit())
{
AssertAutomSelExportOriIsInit(mModele);
std::string aNameBin = mAppli.FullDirResult()
+ StdNameFromCple
(
mAutomExport,
mModele.AutomSelExportOri().Val(),
mModele.AutomNamesExportHomBin().Val(),
"@",
mAppli.PDV1()->Name(),
mAppli.PDV2()->Name()
);
ELISE_fp aFP (aNameBin.c_str(),ELISE_fp::WRITE);
aPack.write(aFP);
aFP.close();
}
}
void cCameraTiepRed::SaveHom(cCameraTiepRed* aCam2,const std::list<int> & aLBox)
{
std::pair<CamStenope*,CamStenope*> aPC (0,0);
if (mAppli.VerifNM())// (this != aCam2)
{
aPC = mAppli.NM().CamOriRel(NameIm(),aCam2->NameIm());
}
CamStenope* aCS1 = aPC.first;
CamStenope* aCS2 = aPC.second;
ElPackHomologue aRes;
for (std::list<int>::const_iterator itI=aLBox.begin(); itI!=aLBox.end() ; itI++)
{
std::string aName = mAppli.NameHomol(NameIm(),aCam2->NameIm(),*itI);
if (ELISE_fp::exist_file(aName))
{
ElPackHomologue aPack = ElPackHomologue::FromFile(aName);
aRes.Add(aPack);
// Verif
if (aCS2)
{
std::vector<double> aVD;
for (ElPackHomologue::const_iterator itP=aPack.begin(); itP!=aPack.end(); itP++)
{
double aDist;
aCS1->PseudoInterPixPrec(itP->P1(),*aCS2,itP->P2(),aDist);
aVD.push_back(aDist);
}
if (aVD.size())
std::cout << "Verif CamOriRel " << MedianeSup(aVD) << "\n";
}
}
}
if (aRes.size())
{
std::string aKeyH = "NKS-Assoc-CplIm2Hom@"+ mAppli.StrOut() + "@dat";
std::string aNameH = mAppli.ICNM()->Assoc1To2(aKeyH,NameIm(),aCam2->NameIm(),true);
aRes.StdPutInFile(aNameH);
// std::string aNameH = mAppli
}
}
void cOneImageOfLayer::SplitLayer
(
cOneImageOfLayer& aL2,
const std::string & aNameH,
const cSplitLayer & aSL
)
{
ElPackHomologue aPck = ElPackHomologue::FromFile(mAppli.DC()+aNameH);
int aLMin = ElMax(mLabMin,aL2.mLabMin);
int aLMax = ElMin(mLabMax,aL2.mLabMax);
for (int aLab = aLMin ; aLab<=aLMax ; aLab++)
{
ElPackHomologue aPackR;
for
(
ElPackHomologue::iterator itP=aPck.begin();
itP!=aPck.end();
itP++
)
{
if (
(LayerOfPt(itP->P1()) == aLab)
&& (aL2.LayerOfPt(itP->P2()) == aLab)
)
{
aPackR.Cple_Add(ElCplePtsHomologues(itP->P1(),itP->P2()));
}
}
std::string aNameRed = mAppli.DC()+ mAppli.ICNM()->Assoc1To2
(
aSL.KeyCalHomSplit(),
aNameH,
ToString(aLab),
true
);
aPackR.StdPutInFile(aNameRed);
// std::cout << "RRRReedd === " << aNameRed << "\n";
}
}
int HomFilterMasq_main(int argc,char ** argv)
{
// MemoArg(argc,argv);
MMD_InitArgcArgv(argc,argv);
std::string aDir,aPat,aFullDir;
bool ExpTxt=false;
std::string PostPlan="_Masq";
std::string KeyCalcMasq;
std::string KeyEquivNoMasq;
std::string MasqGlob;
double aResol=10;
bool AcceptNoMask;
std::string aPostIn= "";
std::string aPostOut= "MasqFiltered";
ElInitArgMain
(
argc,argv,
LArgMain() << EAMC(aFullDir,"Full name (Dir+Pat)", eSAM_IsPatFile),
LArgMain()
<< EAM(PostPlan,"PostPlan",true,"Post to plan, Def : toto ->toto_Masq.tif like with SaisieMasq")
<< EAM(MasqGlob,"GlobalMasq",true,"Global Masq to add to all image")
<< EAM(KeyCalcMasq,"KeyCalculMasq",true,"For tuning masq per image")
<< EAM(KeyEquivNoMasq,"KeyEquivNoMasq",true,"When given if KENM(i1)==KENM(i2), don't masq")
<< EAM(aResol,"Resol",true,"Sub Resolution for masq storing, Def=10")
<< EAM(AcceptNoMask,"ANM",true,"Accept no mask, def = true if MasqGlob and false else")
<< EAM(ExpTxt,"ExpTxt",true,"Ascii format for in and out, def=false")
<< EAM(aPostIn,"PostIn",true,"Post for Input dir Hom, Def=")
<< EAM(aPostOut,"PostOut",true,"Post for Output dir Hom, Def=MasqFiltered")
);
#if (ELISE_windows)
replace( aFullDir.begin(), aFullDir.end(), '\\', '/' );
#endif
SplitDirAndFile(aDir,aPat,aFullDir);
if (EAMIsInit(&PostPlan))
{
CorrecNameMasq(aDir,aPat,PostPlan);
}
if (!EAMIsInit(&AcceptNoMask))
AcceptNoMask = EAMIsInit(&MasqGlob);
cInterfChantierNameManipulateur * anICNM = cInterfChantierNameManipulateur::BasicAlloc(aDir);
Im2D_Bits<1> aImMasqGlob(1,1);
if (EAMIsInit(&MasqGlob))
aImMasqGlob = GetMasqSubResol(aDir+MasqGlob,aResol);
const std::vector<std::string> * aVN = anICNM->Get(aPat);
std::vector<Im2D_Bits<1> > aVMasq;
for (int aKN = 0 ; aKN<int(aVN->size()) ; aKN++)
{
std::string aNameIm = (*aVN)[aKN];
Tiff_Im aTF = Tiff_Im::StdConvGen(aNameIm,1,false);
Pt2di aSzG = aTF.sz();
Pt2di aSzR (round_ni(Pt2dr(aSzG)/aResol));
Im2D_Bits<1> aImMasq(aSzR.x,aSzR.y,1);
std::string aNameMasq = StdPrefix(aNameIm)+PostPlan + ".tif";
if (EAMIsInit(&KeyCalcMasq))
{
aNameMasq = anICNM->Assoc1To1(KeyCalcMasq,aNameIm,true);
}
if (ELISE_fp::exist_file(aNameMasq))
{
Im2D_Bits<1> aImMasqLoc = GetMasqSubResol(aDir+aNameMasq,aResol);
ELISE_COPY(aImMasq.all_pts(),aImMasq.in() && aImMasqLoc.in(0),aImMasq.out());
}
else
{
if (!AcceptNoMask)
{
std::cout << "For Im " << aNameIm << " file " << aNameMasq << " does not exist\n";
ELISE_ASSERT(false,"Masq not found");
}
}
if (EAMIsInit(&MasqGlob))
{
ELISE_COPY(aImMasq.all_pts(),aImMasq.in() && aImMasqGlob.in(0),aImMasq.out());
}
aVMasq.push_back(aImMasq);
// Tiff_Im::CreateFromIm(aImMasq,"SousRes"+aNameMasq);
}
std::string anExt = ExpTxt ? "txt" : "dat";
std::string aKHIn = std::string("NKS-Assoc-CplIm2Hom@")
+ std::string(aPostIn)
+ std::string("@")
+ std::string(anExt);
std::string aKHOut = std::string("NKS-Assoc-CplIm2Hom@")
+ std::string(aPostOut)
+ std::string("@")
+ std::string(anExt);
for (int aKN1 = 0 ; aKN1<int(aVN->size()) ; aKN1++)
{
for (int aKN2 = 0 ; aKN2<int(aVN->size()) ; aKN2++)
{
std::string aNameIm1 = (*aVN)[aKN1];
std::string aNameIm2 = (*aVN)[aKN2];
std::string aNameIn = aDir + anICNM->Assoc1To2(aKHIn,aNameIm1,aNameIm2,true);
if (ELISE_fp::exist_file(aNameIn))
{
bool UseMasq = true;
if (EAMIsInit(&KeyEquivNoMasq))
{
UseMasq = (anICNM->Assoc1To1(KeyEquivNoMasq,aNameIm1,true) != anICNM->Assoc1To1(KeyEquivNoMasq,aNameIm2,true) );
}
TIm2DBits<1> aMasq1 ( aVMasq[aKN1]);
TIm2DBits<1> aMasq2 ( aVMasq[aKN2]);
ElPackHomologue aPackIn = ElPackHomologue::FromFile(aNameIn);
ElPackHomologue aPackOut;
for (ElPackHomologue::const_iterator itP=aPackIn.begin(); itP!=aPackIn.end() ; itP++)
{
Pt2dr aP1 = itP->P1();
Pt2dr aP2 = itP->P2();
Pt2di aQ1 = round_ni(aP1/aResol);
Pt2di aQ2 = round_ni(aP2/aResol);
if ((aMasq1.get(aQ1,0) && aMasq2.get(aQ2,0)) || (! UseMasq))
{
ElCplePtsHomologues aCple(aP1,aP2);
aPackOut.Cple_Add(aCple);
}
}
std::string aNameOut = aDir + anICNM->Assoc1To2(aKHOut,aNameIm1,aNameIm2,true);
aPackOut.StdPutInFile(aNameOut);
std::cout << "IN " << aNameIn << " " << aNameOut << " UseM " << UseMasq << "\n";
}
}
}
// std::vector<cImFMasq *> mVIm;
return 0;
}
int HomFilterMasq_main(int argc,char ** argv)
{
// MemoArg(argc,argv);
MMD_InitArgcArgv(argc,argv);
std::string aDir,aPat,aFullDir;
bool ExpTxt=false;
std::string PostPlan="_Masq";
std::string KeyCalcMasq;
std::string KeyEquivNoMasq;
std::string MasqGlob;
double aResol=10;
bool AcceptNoMask;
std::string aPostIn= "";
std::string aPostOut= "MasqFiltered";
std::string aOriMasq3D,aNameMasq3D;
cMasqBin3D * aMasq3D = 0;
Pt2dr aSelecTer;
ElInitArgMain
(
argc,argv,
LArgMain() << EAMC(aFullDir,"Full name (Dir+Pat)", eSAM_IsPatFile),
LArgMain()
<< EAM(PostPlan,"PostPlan",true,"Post to plan, Def : toto ->toto_Masq.tif like with SaisieMasq")
<< EAM(MasqGlob,"GlobalMasq",true,"Global Masq to add to all image")
<< EAM(KeyCalcMasq,"KeyCalculMasq",true,"For tuning masq per image")
<< EAM(KeyEquivNoMasq,"KeyEquivNoMasq",true,"When given if KENM(i1)==KENM(i2), don't masq")
<< EAM(aResol,"Resol",true,"Sub Resolution for masq storing, Def=10")
<< EAM(AcceptNoMask,"ANM",true,"Accept no mask, def = true if MasqGlob and false else")
<< EAM(ExpTxt,"ExpTxt",true,"Ascii format for in and out, def=false")
<< EAM(aPostIn,"PostIn",true,"Post for Input dir Hom, Def=")
<< EAM(aPostOut,"PostOut",true,"Post for Output dir Hom, Def=MasqFiltered")
<< EAM(aOriMasq3D,"OriMasq3D",true,"Orientation for Masq 3D")
<< EAM(aNameMasq3D,"Masq3D",true,"File of Masq3D, Def=AperiCloud_${OriMasq3D}.ply")
<< EAM(aSelecTer,"SelecTer",true,"[Per,Prop] Period of tiling on ground selection, Prop=proporion of selected")
);
bool aHasOri3D = EAMIsInit(&aOriMasq3D);
bool HasTerSelec = EAMIsInit(&aSelecTer);
#if (ELISE_windows)
replace( aFullDir.begin(), aFullDir.end(), '\\', '/' );
#endif
SplitDirAndFile(aDir,aPat,aFullDir);
if (EAMIsInit(&PostPlan))
{
CorrecNameMasq(aDir,aPat,PostPlan);
}
if (!EAMIsInit(&AcceptNoMask))
AcceptNoMask = EAMIsInit(&MasqGlob) || aHasOri3D;
cInterfChantierNameManipulateur * anICNM = cInterfChantierNameManipulateur::BasicAlloc(aDir);
std::string aKeyOri;
if (aHasOri3D)
{
anICNM->CorrecNameOrient(aOriMasq3D);
if (! EAMIsInit(&aNameMasq3D))
{
aNameMasq3D = aDir + "AperiCloud_" + aOriMasq3D + "_polyg3d.xml";
}
if (ELISE_fp::exist_file(aDir+aNameMasq3D))
{
aMasq3D = cMasqBin3D::FromSaisieMasq3d(aDir+aNameMasq3D);
}
else
{
ELISE_ASSERT(EAMIsInit(&aSelecTer),"Unused OriMasq3D");
}
aKeyOri = "NKS-Assoc-Im2Orient@" + aOriMasq3D;
}
Im2D_Bits<1> aImMasqGlob(1,1);
if (EAMIsInit(&MasqGlob))
aImMasqGlob = GetMasqSubResol(aDir+MasqGlob,aResol);
const std::vector<std::string> * aVN = anICNM->Get(aPat);
std::vector<Im2D_Bits<1> > aVMasq;
std::vector<CamStenope *> aVCam;
double aResolMoy = 0;
for (int aKN = 0 ; aKN<int(aVN->size()) ; aKN++)
{
std::string aNameIm = (*aVN)[aKN];
Tiff_Im aTF = Tiff_Im::StdConvGen(aNameIm,1,false);
Pt2di aSzG = aTF.sz();
Pt2di aSzR (round_ni(Pt2dr(aSzG)/aResol));
Im2D_Bits<1> aImMasq(aSzR.x,aSzR.y,1);
std::string aNameMasq = StdPrefix(aNameIm)+PostPlan + ".tif";
if (EAMIsInit(&KeyCalcMasq))
{
aNameMasq = anICNM->Assoc1To1(KeyCalcMasq,aNameIm,true);
}
if (ELISE_fp::exist_file(aNameMasq))
{
Im2D_Bits<1> aImMasqLoc = GetMasqSubResol(aDir+aNameMasq,aResol);
ELISE_COPY(aImMasq.all_pts(),aImMasq.in() && aImMasqLoc.in(0),aImMasq.out());
}
else
{
if (!AcceptNoMask)
{
std::cout << "For Im " << aNameIm << " file " << aNameMasq << " does not exist\n";
ELISE_ASSERT(false,"Masq not found");
}
}
if (EAMIsInit(&MasqGlob))
{
ELISE_COPY(aImMasq.all_pts(),aImMasq.in() && aImMasqGlob.in(0),aImMasq.out());
}
aVMasq.push_back(aImMasq);
// Tiff_Im::CreateFromIm(aImMasq,"SousRes"+aNameMasq);
if (aHasOri3D)
{
aVCam.push_back(anICNM->StdCamOfNames(aNameIm,aOriMasq3D));
aResolMoy += aVCam.back()->GlobResol();
}
}
if (aHasOri3D)
aResolMoy /= aVCam.size();
std::string anExt = ExpTxt ? "txt" : "dat";
std::string aKHIn = std::string("NKS-Assoc-CplIm2Hom@")
+ std::string(aPostIn)
+ std::string("@")
+ std::string(anExt);
std::string aKHOut = std::string("NKS-Assoc-CplIm2Hom@")
+ std::string(aPostOut)
+ std::string("@")
+ std::string(anExt);
double aPeriodTer=0,aSeuilDistTer=0;
if (HasTerSelec)
{
aPeriodTer = aSelecTer.x * aResolMoy;
aSeuilDistTer = aPeriodTer * sqrt(aSelecTer.y);
}
double aNbInTer=0;
double aNbTestTer=0;
for (int aKN1 = 0 ; aKN1<int(aVN->size()) ; aKN1++)
{
for (int aKN2 = 0 ; aKN2<int(aVN->size()) ; aKN2++)
{
std::string aNameIm1 = (*aVN)[aKN1];
std::string aNameIm2 = (*aVN)[aKN2];
std::string aNameIn = aDir + anICNM->Assoc1To2(aKHIn,aNameIm1,aNameIm2,true);
if (ELISE_fp::exist_file(aNameIn))
{
bool UseMasq = true;
if (EAMIsInit(&KeyEquivNoMasq))
{
UseMasq = (anICNM->Assoc1To1(KeyEquivNoMasq,aNameIm1,true) != anICNM->Assoc1To1(KeyEquivNoMasq,aNameIm2,true) );
}
TIm2DBits<1> aMasq1 ( aVMasq[aKN1]);
TIm2DBits<1> aMasq2 ( aVMasq[aKN2]);
ElPackHomologue aPackIn = ElPackHomologue::FromFile(aNameIn);
ElPackHomologue aPackOut;
for (ElPackHomologue::const_iterator itP=aPackIn.begin(); itP!=aPackIn.end() ; itP++)
{
Pt2dr aP1 = itP->P1();
Pt2dr aP2 = itP->P2();
Pt2di aQ1 = round_ni(aP1/aResol);
Pt2di aQ2 = round_ni(aP2/aResol);
bool Ok = ((aMasq1.get(aQ1,0) && aMasq2.get(aQ2,0)) || (! UseMasq));
if (Ok && aHasOri3D)
{
Pt3dr aPTer= aVCam[aKN1]->PseudoInter(aP1,*(aVCam[aKN2]),aP2);
if (aMasq3D && (! aMasq3D->IsInMasq(aPTer)))
Ok = false;
if (Ok && HasTerSelec)
{
bool OkTer = (mod_real(aPTer.x,aPeriodTer) < aSeuilDistTer) && (mod_real(aPTer.y,aPeriodTer) < aSeuilDistTer);
Ok = OkTer;
aNbTestTer ++;
aNbInTer += OkTer;
}
}
if (Ok)
{
ElCplePtsHomologues aCple(aP1,aP2);
aPackOut.Cple_Add(aCple);
}
}
std::string aNameOut = aDir + anICNM->Assoc1To2(aKHOut,aNameIm1,aNameIm2,true);
aPackOut.StdPutInFile(aNameOut);
std::cout << "IN " << aNameIn << " " << aNameOut << " UseM " << UseMasq << "\n";
}
}
}
// std::vector<cImFMasq *> mVIm;
if (HasTerSelec)
{
std::cout << "A Posteriori Prop=" << aNbInTer / aNbTestTer << "\n";
}
return EXIT_SUCCESS;
}
int HomFusionPDVUnik_main(int argc,char ** argv)
{
MMD_InitArgcArgv(argc,argv);
std::string aDir,aPat,aFullDir;
std::string aPostIn= "";
std::string aPostOut= "MasqFusion";
bool ExpTxt=false;
std::string aDir2;
std::vector<std::string > aDirN;
ElInitArgMain
(
argc,argv,
LArgMain() << EAMC(aFullDir,"Full name (Dir+Pat)", eSAM_IsPatFile)
<< EAMC(aDir2,"Dir of external point", eSAM_IsPatFile),
LArgMain()
<< EAM(aPostIn,"PostIn",true,"Post for Input dir Hom, Def=")
<< EAM(aPostOut,"PostOut",true,"Post for Output dir Hom, Def=MasqFusion")
<< EAM(ExpTxt,"ExpTxt",true,"Ascii format for in and out, def=false")
<< EAM(aDirN,"DirN",true,"Supplementary dirs 2 merge")
);
#if (ELISE_windows)
replace( aFullDir.begin(), aFullDir.end(), '\\', '/' );
#endif
cElemAppliSetFile anEASF(aFullDir);
cInterfChantierNameManipulateur * anICNM = anEASF.mICNM;
const std::vector<std::string> * aVN = anEASF.SetIm();
std::string anExt = ExpTxt ? "txt" : "dat";
std::string aKHIn = std::string("NKS-Assoc-CplIm2Hom@")
+ std::string(aPostIn)
+ std::string("@")
+ std::string(anExt);
std::string aKHOut = std::string("NKS-Assoc-CplIm2Hom@")
+ std::string(aPostOut)
+ std::string("@")
+ std::string(anExt);
aDirN.push_back(aDir);
aDirN.push_back(aDir2);
for (int aKN1 = 0 ; aKN1<int(aVN->size()) ; aKN1++)
{
for (int aKN2 = 0 ; aKN2<int(aVN->size()) ; aKN2++)
{
std::string aNameIm1 = (*aVN)[aKN1];
std::string aNameIm2 = (*aVN)[aKN2];
std::string aNameLocIn = aDir + anICNM->Assoc1To2(aKHIn,aNameIm1,aNameIm2,true);
ElPackHomologue aPackOut;
int aNbH=0;
for (int aKP=0 ; aKP<int(aDirN.size()) ; aKP++)
{
std::string aNameIn= aDirN[aKP] + aNameLocIn;
if (ELISE_fp::exist_file(aNameIn))
{
ElPackHomologue aPackIn = ElPackHomologue::FromFile(aNameIn);
aNbH++;
for (ElPackHomologue::const_iterator itP=aPackIn.begin() ; itP!=aPackIn.end() ; itP++)
{
aPackOut.Cple_Add(itP->ToCple());
}
}
}
if (aPackOut.size() !=0)
{
std::string aNameOut = aDir + anICNM->Assoc1To2(aKHOut,aNameIm1,aNameIm2,true);
aPackOut.StdPutInFile(aNameOut);
if (0)
std::cout << "aNbH " << aNbH << "\n";
}
}
}
return EXIT_SUCCESS;
}
void cAppliApero::ExportMesuresFromCarteProf
(
const cExportMesuresFromCarteProf & anEM,
const cCartes2Export & aC,
cElNuage3DMaille * aNuage,
const ElPackHomologue & aPackH,
cPoseCam * aPose2Compl,
const std::string & aNameCarte
)
{
if (aNameCarte == aPose2Compl->Name())
return;
if (
(! anEM.KeyAssocLiaisons12().IsInit())
&& (! anEM.KeyAssocLiaisons21().IsInit())
)
{
return;
}
cPoseCam * aPoseCarte = PoseFromName(aNameCarte);
const CamStenope * aCSC = aPoseCarte->CurCam();
Pt2di aSzIm = aCSC->Sz();
ElPackHomologue aNewPack;
for
(
ElPackHomologue::const_iterator itH=aPackH.begin();
itH!=aPackH.end();
itH++
)
{
Pt2dr aI1 = aNuage->Plani2Index(itH->P1());
if (aNuage->IndexHasContenuForInterpol(aI1))
{
Pt3dr aPTer = aNuage->PtOfIndexInterpol(aI1);
Pt2dr aP1 = aCSC->R3toF2(aPTer);
if ((aP1.x>0) && (aP1.y>0) && (aP1.x<aSzIm.x) && (aP1.y<aSzIm.y))
{
aNewPack.Cple_Add(ElCplePtsHomologues(aP1,itH->P2()));
}
}
}
if (anEM.KeyAssocLiaisons12().IsInit())
{
std::string aName = mDC
+ mICNM->Assoc1To2
(
anEM.KeyAssocLiaisons12().Val(),
aNameCarte,
aPose2Compl->Name(),
true
);
if (anEM.LiaisonModeAdd().Val())
aNewPack.StdAddInFile(aName);
else
aNewPack.StdPutInFile(aName);
}
if (anEM.KeyAssocLiaisons21().IsInit())
{
std::string aName = mDC
+ mICNM->Assoc1To2
(
anEM.KeyAssocLiaisons21().Val(),
aPose2Compl->Name(),
aNameCarte,
true
);
aNewPack.SelfSwap();
if (anEM.LiaisonModeAdd().Val())
aNewPack.StdAddInFile(aName);
else
aNewPack.StdPutInFile(aName);
}
}
