Export Affinity in det

Author: deseilligny

MMVII/include/MMVII_Geom2D.h

@@ -505,6 +505,8 @@ template <class Type>  class cAffin2D
           /// Basic   1.0
           Type Divisor(const tPt & aPInt) const;
 
+          void AddData(const  cAuxAr2007 & anAux);
+
       private :
           tPt   mTr;
           tPt   mVX;
@@ -516,6 +518,7 @@ template <class Type>  class cAffin2D
 typedef  cAffin2D<tREAL8>  cAff2D_r;
 cBox2dr  ImageOfBox(const cAff2D_r & aAff,const cBox2dr & aBox);
 
+void AddData(const  cAuxAr2007 & anAux,cAff2D_r&);
 
 template <class Type>  class cHomogr2D
 {
@@ -724,7 +727,7 @@ class cEllipse
        cPt2dr  Tgt(const cPt2dr &) const;
        cPt2dr  NormalInt(const cPt2dr &) const;
 
-       cPt2dr InterSemiLine(tREAL8 aTeta) const;    /// compute the intesection of 1/2 line of direction teta with the ellipse
+       cPt2dr InterSemiLine(tREAL8 aTetacAff2D_r) const;    /// compute the intesection of 1/2 line of direction teta with the ellipse
 
        /// get points on ellipse that are +- less regularly sampled at a given step
        void GetTetasRegularSample(std::vector<tREAL8> & aVTetas,const tREAL8 & aDist);
@@ -851,7 +854,8 @@ struct cSaveExtrEllipe
           cSaveExtrEllipe ();
           static std::string NameFile(const cPhotogrammetricProject & ,const cSetMesPtOf1Im &,bool Input);
 
-          cEllipse  mEllipse;
+          cAff2D_r    mAffIm2Ref;
+          cEllipse    mEllipse;
           std::string mNameCode;
           tREAL4 mBlack;
           tREAL4 mWhite;

MMVII/src/CodedTarget/cCdts_CheckBoardTarget.cpp

@@ -3,6 +3,10 @@
 
 namespace MMVII
 {
+/*
+  return mAffIm2Mod.Inverse(aPMod);
+*/
+
 
 /* ********************************************* */
 /*                                               */
@@ -598,6 +602,7 @@ void cCdEllipse::EstimateAffinity()
 
 bool cCdEllipse::BOutCB()   const {return mBOutCB;}
 bool cCdEllipse::IsCircle() const {return mIsCircle;}
+const cAff2D_r   &  cCdEllipse::AffIm2Mod() const {return mAffIm2Mod;}
 
 bool cCdEllipse::IsOk() const {return mIsOk;}
 void cCdEllipse::AssertOk() const

MMVII/src/CodedTarget/cCheckBoardTargetExtract.cpp

@@ -569,6 +569,7 @@ void  cAppliCheckBoardTargetExtract::DoExport()
 
              cEllipse anEl = aCdtM.Ell().Scale(aCdtM.mScale);
              cSaveExtrEllipe aSEE(anEl,aCdtM.mBlack,aCdtM.mWhite,aCode);
+             aSEE.mAffIm2Ref = aCdtM.AffIm2Mod();
              aVSavE.push_back(aSEE);
              //  cSaveExtrEllipe anESave(*anEE,aCode);
          }

MMVII/src/CodedTarget/cCheckBoardTargetExtract.h

@@ -138,6 +138,9 @@ class cCdEllipse : public cCdRadiom
            cPt2dr  I2M(const cPt2dr & aPIM) const; 
 	   bool  IsCircle() const;
 
+       const cAff2D_r   &  AffIm2Mod() const;
+
+
 
            /** compute the "normalized" length to encoding part*/ 
 	   std::pair<tREAL8,cPt2dr>  Length2CodingPart(tREAL8 aPropGray,const cPt2dr & aModCenterBit) const;

MMVII/src/CodedTarget/cCircTargetExtract.cpp

@@ -187,13 +187,15 @@ cSaveExtrEllipe::cSaveExtrEllipe(const cCircTargExtr & aCTE,const std::string &
 
 
 cSaveExtrEllipe::cSaveExtrEllipe()  :
+    mAffIm2Ref (cAff2D_r::Translation(cPt2dr(0,0))),
     mEllipse (cEllipse(cDenseVect<tREAL8>(std::vector<tREAL8>{1,0,1,0,0}) ,cPt2dr(0,0)))
 {
 }
 
 
 void AddData(const  cAuxAr2007 & anAux, cSaveExtrEllipe & aCTE)
 {
+    AddData(cAuxAr2007("AffinIm2Ref",anAux)  , aCTE.mAffIm2Ref);
      AddData(cAuxAr2007("Ellipse",anAux)  , aCTE.mEllipse);
      AddData(cAuxAr2007("NameCode",anAux) , aCTE.mNameCode);
      AddData(cAuxAr2007("Black",anAux)    , aCTE.mBlack);

MMVII/src/Geom2D/GeomsMappings2D.cpp

@@ -299,6 +299,21 @@ template <class Type>  cAffin2D<Type> cAffin2D<Type>::MapInverse() const
 }
 
 
+ template <class Type>  void cAffin2D<Type>::AddData(const  cAuxAr2007 & anAux)
+ {
+     MMVII::AddData(cAuxAr2007("Tr",anAux),mTr);
+     MMVII::AddData(cAuxAr2007("Vx",anAux),mVX);
+     MMVII::AddData(cAuxAr2007("Vx",anAux),mVY);
+
+     if (anAux.Ar().Input())
+         *this = cAffin2D<Type>(mTr,mVX,mVY);
+ }
+
+void AddData(const  cAuxAr2007 & anAux,cAff2D_r& anAff)
+{
+    anAff.AddData(anAux);
+}
+
 
 
 template <class Type> cPtxd<Type,2>  cAffin2D<Type>::VecValue(const tPt & aP) const