Merge branch 'master' of https://github.com/micmacIGN/micmac

fusion

Author: deseilligny

CMakeLists.txt

@@ -610,6 +610,10 @@ ENDIF()
 
 # DEFINITION : des preprocesseurs windows
 IF (MSVC)
+	if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+		set (CMAKE_INSTALL_PREFIX "${PROJECT_SOURCE_DIR}" CACHE PATH "default install path" FORCE )
+	endif()
+
 	set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE" )
 	# Zm131 -> Erreur de compilation sous windows 7 avec Cuda et Boost
 	if (${CUDA_ENABLED})

CodeGenere/File2String/Str_SuperposImage.cpp

@@ -1,5 +1,5 @@
 #include "StdAfx.h"
-const char * (theNameVar_SuperposImage[1969]) = {
+const char * (theNameVar_SuperposImage[1993]) = {
 "<GenCpp>\n",
 "\n",
 "\n",
@@ -1493,6 +1493,30 @@ const char * (theNameVar_SuperposImage[1969]) = {
 "       <Triplets  Nb=\"*\" RefType=\"Xml_OneTriplet\"> </Triplets>\n",
 "</Xml_TopoTriplet>\n",
 "\n",
+"\n",
+"<!-- Export camera directions -->\n",
+"<Xml_SingleDir Nb=\"1\" Class=\"true\" ToReference=\"true\">\n",
+"    <PIm Nb=\"1\" Type=\"Pt2dr\"> </PIm>\n",
+"    <P1 Nb=\"1\" Type=\"Pt3dr\"> </P1>\n",
+"    <P2 Nb=\"1\" Type=\"Pt3dr\"> </P2>\n",
+"</Xml_SingleDir>\n",
+"\n",
+"\n",
+"<Xml_ImDir Nb=\"1\" Class=\"true\" ToReference=\"true\">\n",
+"    <Name Nb=\"1\" Type=\"std::string\"> </Name>\n",
+"    <P1OC Nb=\"1\" Type=\"Pt3dr\"> </P1OC>\n",
+"    <P2OC Nb=\"1\" Type=\"Pt3dr\"> </P2OC>\n",
+"    <ListDir Nb=\"*\" RefType=\"Xml_SingleDir\"> </ListDir>\n",
+"</Xml_ImDir>\n",
+"\n",
+"\n",
+"<Xml_ImSetDir Nb=\"1\" Class=\"true\" ToReference=\"true\">\n",
+"    <Ims Nb=\"*\" RefType=\"Xml_ImDir\"> </Ims>\n",
+"</Xml_ImSetDir>\n",
+"\n",
+"\n",
+"\n",
+"\n",
 "<!-- Export RPCs -->\n",
 "<SAMP_NUM_COEFF Nb=\"1\" Class=\"true\" ToReference=\"true\">\n",
 "    <SAMP_NUM_COEFF_1  Nb=\"1\" Type=\"double\"></SAMP_NUM_COEFF_1>\n",

include/XML_GEN/SuperposImage.h

@@ -6724,6 +6724,98 @@ void  BinaryUnDumpFromFile(cXml_TopoTriplet &,ELISE_fp &);
 
 std::string  Mangling( cXml_TopoTriplet *);
 
+/******************************************************/
+/******************************************************/
+/******************************************************/
+class cXml_SingleDir
+{
+    public:
+        cGlobXmlGen mGXml;
+
+        friend void xml_init(cXml_SingleDir & anObj,cElXMLTree * aTree);
+
+
+        Pt2dr & PIm();
+        const Pt2dr & PIm()const ;
+
+        Pt3dr & P1();
+        const Pt3dr & P1()const ;
+
+        Pt3dr & P2();
+        const Pt3dr & P2()const ;
+    private:
+        Pt2dr mPIm;
+        Pt3dr mP1;
+        Pt3dr mP2;
+};
+cElXMLTree * ToXMLTree(const cXml_SingleDir &);
+
+void  BinaryDumpInFile(ELISE_fp &,const cXml_SingleDir &);
+
+void  BinaryUnDumpFromFile(cXml_SingleDir &,ELISE_fp &);
+
+std::string  Mangling( cXml_SingleDir *);
+
+/******************************************************/
+/******************************************************/
+/******************************************************/
+class cXml_ImDir
+{
+    public:
+        cGlobXmlGen mGXml;
+
+        friend void xml_init(cXml_ImDir & anObj,cElXMLTree * aTree);
+
+
+        std::string & Name();
+        const std::string & Name()const ;
+
+        Pt3dr & P1OC();
+        const Pt3dr & P1OC()const ;
+
+        Pt3dr & P2OC();
+        const Pt3dr & P2OC()const ;
+
+        std::list< cXml_SingleDir > & ListDir();
+        const std::list< cXml_SingleDir > & ListDir()const ;
+    private:
+        std::string mName;
+        Pt3dr mP1OC;
+        Pt3dr mP2OC;
+        std::list< cXml_SingleDir > mListDir;
+};
+cElXMLTree * ToXMLTree(const cXml_ImDir &);
+
+void  BinaryDumpInFile(ELISE_fp &,const cXml_ImDir &);
+
+void  BinaryUnDumpFromFile(cXml_ImDir &,ELISE_fp &);
+
+std::string  Mangling( cXml_ImDir *);
+
+/******************************************************/
+/******************************************************/
+/******************************************************/
+class cXml_ImSetDir
+{
+    public:
+        cGlobXmlGen mGXml;
+
+        friend void xml_init(cXml_ImSetDir & anObj,cElXMLTree * aTree);
+
+
+        std::list< cXml_ImDir > & Ims();
+        const std::list< cXml_ImDir > & Ims()const ;
+    private:
+        std::list< cXml_ImDir > mIms;
+};
+cElXMLTree * ToXMLTree(const cXml_ImSetDir &);
+
+void  BinaryDumpInFile(ELISE_fp &,const cXml_ImSetDir &);
+
+void  BinaryUnDumpFromFile(cXml_ImSetDir &,ELISE_fp &);
+
+std::string  Mangling( cXml_ImSetDir *);
+
 /******************************************************/
 /******************************************************/
 /******************************************************/

include/XML_GEN/SuperposImage.xml

@@ -1491,6 +1491,30 @@
        <Triplets  Nb="*" RefType="Xml_OneTriplet"> </Triplets>
 </Xml_TopoTriplet>
 
+
+<!-- Export camera directions -->
+<Xml_SingleDir Nb="1" Class="true" ToReference="true">
+    <PIm Nb="1" Type="Pt2dr"> </PIm>
+    <P1 Nb="1" Type="Pt3dr"> </P1>
+    <P2 Nb="1" Type="Pt3dr"> </P2>
+</Xml_SingleDir>
+
+
+<Xml_ImDir Nb="1" Class="true" ToReference="true">
+    <Name Nb="1" Type="std::string"> </Name>
+    <P1OC Nb="1" Type="Pt3dr"> </P1OC>
+    <P2OC Nb="1" Type="Pt3dr"> </P2OC>
+    <ListDir Nb="*" RefType="Xml_SingleDir"> </ListDir>
+</Xml_ImDir>
+
+
+<Xml_ImSetDir Nb="1" Class="true" ToReference="true">
+    <Ims Nb="*" RefType="Xml_ImDir"> </Ims>
+</Xml_ImSetDir>
+
+
+
+
 <!-- Export RPCs -->
 <SAMP_NUM_COEFF Nb="1" Class="true" ToReference="true">
     <SAMP_NUM_COEFF_1  Nb="1" Type="double"></SAMP_NUM_COEFF_1>

include/general/photogram.h

@@ -863,9 +863,6 @@ class cElHomographie  : public cElMap2D
           virtual void  InitFromParams(const std::vector<double> &aSol);
           virtual std::vector<double> Params() const;
 
-
-
-
           bool HasNan() const;
 
           Pt2dr Direct  (const Pt2dr & aP) const;

include/private/files.h

@@ -193,7 +193,7 @@ class  ELISE_fp
 
          ~ELISE_fp();
          ELISE_fp(eModeBinTxt ModeBin=eTxtOnPremierLigne);
-         ELISE_fp(const char *,mode_open,bool svp = false,eModeBinTxt  =eTxtOnPremierLigne);
+         ELISE_fp(const char *,mode_open=READ,bool svp = false,eModeBinTxt  =eTxtOnPremierLigne);
 
          U_INT1 read_U_INT1();
          U_INT2 read_U_INT2();

src/CBinaires/mm3d.cpp

@@ -620,6 +620,7 @@ extern int GCPCtrlPly_main(int argc,char ** argv);
 extern int TestCmpIm_Ewelina(int argc,char ** argv);
 extern int TestER_hom_main(int argc,char ** argv);
 extern int PFM2Tiff_main(int argc,char ** argv);
+extern int ImPts2Dir_main(int argc,char ** argv);
 extern int TestPush(int argc,char ** argv);
 //extern int Cillia_main(int argc,char ** argv);
 extern int Homol2GCP_main(int argc,char ** argv);
@@ -644,10 +645,14 @@ extern int  T2V_main(int argc,char ** argv);
 extern int  Tapioca_IDR_main(int argc,char ** argv);
 extern int  resizeImg_main(int argc,char ** argv);
 extern int  resizeHomol_main(int argc,char ** argv);
+extern int  VarioCamTo8Bits_main(int argc,char ** argv);
 // test je jo
 extern int  main_test(int argc,char ** argv);
+extern int  main_test2(int argc,char ** argv);
 extern int  main_ero(int argc,char ** argv);
 extern int  main_ascii2tif(int argc,char ** argv);
+int Test_ascii2tif_BlurinessSelect(int argc,char ** argv);
+extern int  GCP2Hom_main(int argc,char ** argv);
 #if (ELISE_UNIX)
 extern int  DocEx_Introanalyse_main(int,char **);
 #endif
@@ -864,6 +869,7 @@ const std::vector<cMMCom> & TestLibAvailableCommands()
        aRes.push_back(cMMCom("TestER",TestER_main2,"ER test workplace"));
        aRes.push_back(cMMCom("TestER2",TestER_hom_main,"ER test hom"));
        aRes.push_back(cMMCom("Tif2Pfm",PFM2Tiff_main,"Tif to pfm or the other way around"));
+       aRes.push_back(cMMCom("Im2Dir",ImPts2Dir_main,"Extract directions from images"));
        aRes.push_back(cMMCom("TestAT",TestPush,"AT test workplace"));
 
 //       aRes.push_back(cMMCom("TestCillia",Cillia_main,"cillia"));
@@ -950,15 +956,19 @@ const std::vector<cMMCom> & TestLibAvailableCommands()
         aRes.push_back(cMMCom("GeoSud",ServiceGeoSud_GeoSud_main,""));
         aRes.push_back(cMMCom("Surf",ServiceGeoSud_Surf_main,""));
         aRes.push_back(cMMCom("ImageRectification",ImageRectification,"Rectify individual aerial images, ground is assumed to be a plane"));
+        aRes.push_back(cMMCom("ThermicVarioCamTo8Bits",VarioCamTo8Bits_main,"Convert 16 bits Variocam thermic images to 8 bits"));
         aRes.push_back(cMMCom("jo_FFH",FilterFileHom_main,"filtrer un fichier de paire d'image"));
         aRes.push_back(cMMCom("jo_T2V",T2V_main,"appliquer une homographie a un ensemble d'im thermique pour Reg avec images visibles"));
         aRes.push_back(cMMCom("jo_test",main_test,"test function for didro project"));
+        aRes.push_back(cMMCom("jo_test2",main_test2,"test function for didro project"));
+        aRes.push_back(cMMCom("GCP2Hom",GCP2Hom_main,"Convert GCP 2D measures in homol file"));
         aRes.push_back(cMMCom("TapiocaIDR",Tapioca_IDR_main,"Utiliser Tapioca avec des Images de Résolution Différente (effectue un resample des images)"));
         aRes.push_back(cMMCom("ResizeImg",resizeImg_main,"Resize image in order to reach a specific image width"));
         aRes.push_back(cMMCom("ResizeHomol",resizeHomol_main,"Resize Homol pack"));
         aRes.push_back(cMMCom("Ero",main_ero,"Egalisation Radiometrique pour une paire d'ortho"));
         aRes.push_back(cMMCom("Eros",EgalRadioOrto_main,"Egalisation Radiometrique d'OrthoS"));
-        aRes.push_back(cMMCom("Ascii2Tif",main_ascii2tif,"transform ascii file from irbis software into tif file."));
+        aRes.push_back(cMMCom("Ascii2Tif",main_ascii2tif,"transform ascii file to tif file, designed for ascii from irbis or sdk direct (variocam and optris)."));
+        aRes.push_back(cMMCom("Ascii2TifWithSelection",Test_ascii2tif_BlurinessSelect,"from list of ascii file from video frame, perform a selection of sharpest frame and export it in tif format."));
 
 // #if (ELISE_QT_VERSION >= 4)
         aRes.push_back(cMMCom("Masq3Dto2D",Masq3Dto2D_main,"Create a 2D Masq from Nuage and 3D Masq "));

src/RegTIRVIS/Keypoint.cpp

@@ -23,3 +23,9 @@ KeyPoint::KeyPoint(float x, float y, float size, float angle, float response)
 KeyPoint::KeyPoint(){}
 
 KeyPoint::~KeyPoint(){}
+
+void KeyPoint::undist(CamStenope * aCalib)
+{
+    Pt2dr ptUndist=aCalib->DistDirecte(Pt2dr(m_Point.x,m_Point.y));
+    m_Point=Pt2df(ptUndist.x,ptUndist.y);
+}

src/RegTIRVIS/Keypoint.h

@@ -31,6 +31,7 @@ class KeyPoint
 	 void setSize(float sz) {m_size=sz;}
 	 void setAngle(float angle){m_angle=angle;}
      void setResponse(float response){m_response=response;}
+     void undist(CamStenope * aCalib);
      //getters
      Pt2df getPoint(){return m_Point;}
      float getAngle(){return m_angle;}