From: donadio <donadio>
Date: Fri, 5 Jun 2009 11:22:46 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: EED.02Oct2009~52
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=7624fbab400d414b4d8277e7f0febadcabcec5c0;p=creaMaracasVisu.git

*** 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 0e4becc..4318e0f 100644
--- 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 c4c3fa0..2849395 100644
--- 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