Merge branch 'master' into IncludeALGLIB

.gitignore

@@ -418,3 +418,4 @@ binaire-aux/darwin/Rnx2rtkp
 binaire-aux/darwin/SurfaceTrimmer
 include/StdAfx.h.gch
 include/StdAfx.h.pch
+include/graphes/cNewO_BuildOptions.h

CodeGenere/File2String/Str_DefautChantierDescripteur.cpp

@@ -1,5 +1,5 @@
 #include "StdAfx.h"
-const char * theNameVar_DefautChantierDescripteur[3262] = {
+const char * theNameVar_DefautChantierDescripteur[3343] = {
 "<!--\n",
 "   Pour ne pas l'oublier : \n",
 "      Un exemple avec utilisation des fonctionnalites arithmetique\n",
@@ -719,6 +719,71 @@ const char * theNameVar_DefautChantierDescripteur[3262] = {
 "	<SubDirAutoMake> Homol#1 </SubDirAutoMake>\n",
 "	<SubDirAutoMakeRec> true </SubDirAutoMakeRec>\n",
 "    </KeyedNamesAssociations>\n",
+"\n",
+"    <KeyedNamesAssociations>\n",
+"        <IsParametrized>  true </IsParametrized>\n",
+"        <Calcs>\n",
+"            <Arrite>  2 1 </Arrite>\n",
+"            <Direct>\n",
+"                <PatternTransform> (.*)%(.*) </PatternTransform>\n",
+"                <CalcName> Ori-GenEpi-#1/Orient_$1-$2.#2  </CalcName>\n",
+"                <Separateur > % </Separateur>\n",
+"             </Direct>\n",
+"<!--\n",
+"   A priori inverse pas utile. Si elle devait l'etre, il faudrait changer les conventions et \n",
+"	     <Inverse>\n",
+"                <PatternTransform>  Ori-Epi-#1/Orient_(.*)_-_(.*).#2 </PatternTransform>\n",
+"                <CalcName> $1  </CalcName>\n",
+"                <CalcName> $2  </CalcName>\n",
+"	     </Inverse>\n",
+"-->\n",
+"        </Calcs>\n",
+"        <Key>  NKS-Assoc-CplIm2OriGenEpi </Key>\n",
+"	<SubDirAutoMake> Ori-GenEpi-#1 </SubDirAutoMake>\n",
+"	<SubDirAutoMakeRec> true </SubDirAutoMakeRec>\n",
+"    </KeyedNamesAssociations>\n",
+"\n",
+"    <KeyedNamesAssociations>\n",
+"        <IsParametrized>  true </IsParametrized>\n",
+"        <Calcs>\n",
+"            <Arrite>  3 1 </Arrite>\n",
+"            <Direct>\n",
+"                <PatternTransform> (.*)%(.*)%(.*) </PatternTransform>\n",
+"                <CalcName> EpipIm-$1-$2-$3.#1  </CalcName>\n",
+"                <Separateur > % </Separateur>\n",
+"             </Direct>\n",
+"<!--\n",
+"   A priori inverse pas utile. Si elle devait l'etre, il faudrait changer les conventions et \n",
+"	     <Inverse>\n",
+"                <PatternTransform>  Ori-Epi-#1/Orient_(.*)_-_(.*).#2 </PatternTransform>\n",
+"                <CalcName> $1  </CalcName>\n",
+"                <CalcName> $2  </CalcName>\n",
+"	     </Inverse>\n",
+"-->\n",
+"        </Calcs>\n",
+"        <Key>  NKS-Assoc-NameImEpip </Key>\n",
+"    </KeyedNamesAssociations>\n",
+"\n",
+"    <KeyedNamesAssociations>\n",
+"        <IsParametrized>  true </IsParametrized>\n",
+"        <Calcs>\n",
+"            <Arrite>  3 1 </Arrite>\n",
+"            <Direct>\n",
+"                <PatternTransform> (.*)%(.*)%(.*) </PatternTransform>\n",
+"                <CalcName> EpipAppuis-$1-$2-$3.xml  </CalcName>\n",
+"                <Separateur > % </Separateur>\n",
+"			</Direct>\n",
+"			<Inverse>\n",
+"					<PatternTransform> EpipAppuis-(.*)-(.*)-(.*).xml </PatternTransform>\n",
+"					<CalcName> $2 </CalcName>\n",
+"					<CalcName> $3 </CalcName>\n",
+"			</Inverse>\n",
+"        </Calcs>\n",
+"        <Key>  NKS-Assoc-NameAppuiEpip </Key>\n",
+"    </KeyedNamesAssociations>\n",
+"\n",
+"\n",
+"\n",
 "    \n",
 "     <KeyedSetsOfNames >\n",
 "          <IsParametrized>  true </IsParametrized>\n",
@@ -2601,6 +2666,22 @@ const char * theNameVar_DefautChantierDescripteur[3262] = {
 "        <Key> Key-Assoc-Nuage-Ply </Key>\n",
 "    </KeyedNamesAssociations>\n",
 "\n",
+"<!-- \n",
+"	MEC - decompose image name from MEC2Im-XXX\n",
+"-->\n",
+"\n",
+"    <KeyedNamesAssociations>\n",
+"        <Calcs>\n",
+"            <Arrite>  2 1 </Arrite>\n",
+"            <Direct>\n",
+"                <PatternTransform> (.*)@(.*) </PatternTransform>\n",
+"				<CalcName>  MEC2Im-$1-$2/  </CalcName>\n",
+"             </Direct>\n",
+"        </Calcs>\n",
+"        <Key> Key-Assoc-MEC-Dir </Key>\n",
+"    </KeyedNamesAssociations>\n",
+"\n",
+"\n",
 "\n",
 "<!--\n",
 "      Masq-Image\n",

CodeGenere/File2String/Str_SuperposImage.cpp

@@ -1,5 +1,5 @@
 #include "StdAfx.h"
-const char * theNameVar_SuperposImage[2001] = {
+const char * theNameVar_SuperposImage[2022] = {
 "<GenCpp>\n",
 "\n",
 "\n",
@@ -1987,6 +1987,27 @@ const char * theNameVar_SuperposImage[2001] = {
 "     <Maps Nb=\"*\" RefType=\"Xml_Map2DElem\"> </Maps>\n",
 "</Xml_Map2D>\n",
 "\n",
+"<!-- Classes to represent measures used for projection of unknown 3D lines in images -->\n",
+"\n",
+"<!-- Nb, Class and ToRef must be present on \"top\" class -->\n",
+"<Xml_OneMeasure3DLineInIm  Nb=\"1\" Class=\"true\" ToReference=\"true\">\n",
+"    <!-- std::string and Pt2dr are atomic types eligible to generate code -->\n",
+"    <NameLine3D Nb=\"1\" Type=\"std::string\"> </NameLine3D>\n",
+"    <P1 Nb=\"1\" Type=\"Pt2dr\"> </P1>\n",
+"    <P2 Nb=\"1\" Type=\"Pt2dr\"> </P2>\n",
+"</Xml_OneMeasure3DLineInIm>\n",
+"\n",
+"<Xml_SetMeasure3DLineInOneIm  Nb=\"1\" Class=\"true\" ToReference=\"true\">\n",
+"    <NameIm Nb=\"1\" Type=\"std::string\"> </NameIm>\n",
+"    <!-- We use RefType because it's not an atomic but one xml previously  created -->\n",
+"    <Measures Nb=\"*\" RefType=\"Xml_OneMeasure3DLineInIm\"> </Measures>\n",
+"</Xml_SetMeasure3DLineInOneIm>\n",
+"\n",
+"<Xml_SetMeasureGlob3DLine Nb=\"1\" Class=\"true\" ToReference=\"true\">\n",
+"    <AllMeasures Nb=\"*\" RefType=\"Xml_SetMeasure3DLineInOneIm\"> </AllMeasures>\n",
+"</Xml_SetMeasureGlob3DLine>\n",
+"\n",
+"\n",
 "\n",
 "<Verbatim File=\".h.cpp\">\n",
 "// };\n",

MMVII/.gitignore

@@ -1 +1,9 @@
 include/CodeGen_*.h
+*.o
+*.aux
+*.idx
+*.log
+*.out
+*.toc
+MMVII/MMVII-TestDir/Input/Files/RelTest.xml
+MMVII/MMVII-TestDir/Input/Files/RelTest_0-5.xml