Ellipse : export geom readable

Author: deseilligny

MMVII/include/MMVII_2Include_Serial_Tpl.h

@@ -359,6 +359,23 @@ template <class Type> void AddData(const cAuxAr2007 & anAux, cDenseVect<Type>& a
     AddData(anAux,aVect.DIm());
 }
 
+/// if we want a human readable vector for small vect ..
+template <class Type> void AddDataAsStdVect(const cAuxAr2007 & anAux,cDenseVect<Type>& aDenseV)
+{
+     std::vector<Type> aStdV;
+     if (anAux.Input())
+     {
+        MMVII::AddData(anAux,aStdV);
+        aDenseV = cDenseVect<Type>(aStdV);
+     }
+     else
+     {
+        aStdV = aDenseV.ToStdVect();
+        MMVII::AddData(anAux,aStdV);
+     }
+}
+
+
 // template <class Type,const int Dim> void AddData(const cAuxAr2007 & anAux,cDataTypedIm<Type,Dim> & aIm)
 
 

MMVII/include/MMVII_InstrumentalBlock.h

@@ -126,8 +126,8 @@ void AddData(const  cAuxAr2007 & anAux,cIrbCal_Clino1 & aClino);
 class cIrb_SigmaPoseRel
 {
     public :
-           cIrb_SigmaPoseRel();
-           cIrb_SigmaPoseRel(int aK1,int aK2,tREAL8 aSigmaTr,tREAL8 aSigmaRot);
+       cIrb_SigmaPoseRel();
+       cIrb_SigmaPoseRel(int aK1,int aK2,tREAL8 aSigmaTr,tREAL8 aSigmaRot);
 
 	   int    mK1;
 	   int    mK2;

MMVII/src/Geom2D/cEllipse2D.cpp

@@ -101,15 +101,44 @@ cEllipse::cEllipse(const cPt2dr & aCenter,tREAL8 aRay) :
 {
 }
 
+
+/*
+template <class Type> void AddDataAsStdVect(const cAuxAr2007 & anAux,cDenseVect<Type>& aDenseV)
+{
+     std::vector<Type> aStdV;
+     if (anAux.Input())
+     {
+        MMVII::AddData(anAux,aStdV);
+	aDenseV = cDenseVect<Type>(aStdV);
+     }
+     else
+     {
+        aStdV = aDenseV.ToStdVect();
+        MMVII::AddData(anAux,aStdV);
+     }
+}
+*/
+
+
 void cEllipse::AddData(const  cAuxAr2007 & anAux)
 {
      AssertOk();
-     MMVII::AddData(cAuxAr2007("Vect",anAux),mV);
+     AddDataAsStdVect(anAux,mV);
+     //  MMVII::AddData(cAuxAr2007("Vect",anAux),mV);
      MMVII::AddData(cAuxAr2007("C0",anAux),mC0);
+     //  MMVII::AddData(cAuxAr2007("C0",anAux),mC0);
+     {
+         cAuxAr2007 anAuxGeom("GeomForComment",anAux);
+	 MMVII::AddData(cAuxAr2007("LengthGreadAxe",anAuxGeom),mLGa);
+	 MMVII::AddData(cAuxAr2007("LengthSmallAxe",anAuxGeom),mLSa);
+	 MMVII::AddData(cAuxAr2007("DirGreadAxe",anAuxGeom),mVGa);
+         anAuxGeom.Ar().AddComment("GA=" + ToStr(mLGa) + " SA=" + ToStr(mLSa));
+     }
      if (anAux.Input())
      {
           *this = cEllipse(mV,mC0);
      }
+
 }
 
 void AddData(const  cAuxAr2007 & anAux,cEllipse & anEl)

MMVII/src/Instrumental/cIrb_Cams.cpp

@@ -231,7 +231,7 @@ void cIrbCal_CamSet::SetSigma(const cIrb_SigmaPoseRel& aNewS)
        if ((aSigm.mK1==aNewS.mK1) && (aSigm.mK2==aNewS.mK2))
        {
            isFound=true;
-	   aSigm = aNewS;
+           aSigm = aNewS;
        }
    }