*** empty log message ***

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.cpp
index 0e4becc52e749e048b89ce62bdf4ed104c9a6f99..4318e0fbb24e3a3e569574739ce7edef8d426468 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.cpp
@@ -620,6 +620,63 @@ void manualContourModel::Open(FILE *ff) // virtual
        }
 }
 
+// ----------------------------------------------------------------------------
+void manualContourModel::OpenAndTransformSpacing(FILE *ff, double imgSpac[3], double roiSpac[3]) // virtual
+{
+       char tmp[255];
+       int i;
+       int numberOfControlPoints;
+       double x,y,z;
+
+       double transX, transY;
+       transX = (double) roiSpac[0]/imgSpac[0];
+       transY = (double) roiSpac[1]/imgSpac[1];
+
+       fscanf(ff,"%s",tmp); // NumberOfControlPoints
+       fscanf(ff,"%s",tmp); // ##
+       numberOfControlPoints = atoi(tmp);
+       for (i=0;i<numberOfControlPoints;i++)
+       {
+               fscanf(ff,"%s",tmp); // X
+               x = atof(tmp);
+               x = x*transX;
+               fscanf(ff,"%s",tmp); // Y
+               y = atof(tmp);
+               y = y*transY;
+               fscanf(ff,"%s",tmp); // Z
+               z = atof(tmp);
+               AddPoint(x,y,z);
+       }
+}
+
+// ----------------------------------------------------------------------------
+void manualContourModel::OpenAndTransformDimension(FILE *ff, int imgDim[3], int roiDim[3]) // virtual
+{
+       char tmp[255];
+       int i;
+       int numberOfControlPoints;
+       double x,y,z;
+
+       double transX, transY;
+       transX = (double) imgDim[0]/roiDim[0];
+       transY = (double) imgDim[1]/roiDim[1];
+
+       fscanf(ff,"%s",tmp); // NumberOfControlPoints
+       fscanf(ff,"%s",tmp); // ##
+       numberOfControlPoints = atoi(tmp);
+       for (i=0;i<numberOfControlPoints;i++)
+       {
+               fscanf(ff,"%s",tmp); // X
+               x = atof(tmp);
+               x = x*transX;
+               fscanf(ff,"%s",tmp); // Y
+               y = atof(tmp);
+               y = y*transY;
+               fscanf(ff,"%s",tmp); // Z
+               z = atof(tmp);
+               AddPoint(x,y,z);
+       }
+}
 
 // ----------------------------------------------------------------------------
 int manualContourModel::GetTypeModel() //virtual

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.h
index c4c3fa069ffeb3fe8708588688aba83b12cce5c4..28493954eadb982e93ae7aa41966c5cd161be363 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.h
@@ -46,6 +46,8 @@ public:
        virtual manualContourModel * Clone();
        void CopyAttributesTo( manualContourModel *cloneObject );
        virtual void Open(FILE *ff);    // virtual
+       virtual void OpenAndTransformSpacing(FILE *ff, double imgSpac[3], double roiSpac[3]);
+       virtual void OpenAndTransformDimension(FILE *ff, int imgDim[3], int roiDim[3]);
        virtual void Save(FILE *ff);    // virtual
        virtual int GetTypeModel();                     // virtual