X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualContour%2FmanualContourModel.cpp;h=72999cfda745fb9fc6dc06e6981b90903bdc4ce8;hb=0eb7703d529af805f4a4f2a1b01b4151283c2327;hp=4318e0fbb24e3a3e569574739ce7edef8d426468;hpb=7624fbab400d414b4d8277e7f0febadcabcec5c0;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.cpp
index 4318e0f..72999cf 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.cpp
@@ -31,6 +31,12 @@ manualContourModel::manualContourModel()
 
 	_delta_JSTG			= 0.0;
 //---------------------------------------------------------------------------------------------------------------
+
+//CMRU 17-08-09 -------------------------------------------------------------------------------------------------
+	_realSize			= 0.0;
+	_label				= "";
+//---------------------------------------------------------------------------------------------------------------
+
 }
 
 // ----------------------------------------------------------------------------
@@ -45,7 +51,7 @@ manualContourModel::~manualContourModel()
 	_cntSplineX->RemoveAllPoints();
 	_cntSplineY->RemoveAllPoints();
 	_cntSplineZ->RemoveAllPoints();
-	
+
 	_cntSplineX->Delete();
 	_cntSplineY->Delete();
 	_cntSplineZ->Delete();
@@ -620,64 +626,6 @@ 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
 {
@@ -703,7 +651,35 @@ void manualContourModel::Save(FILE *ff) // virtual
 		fprintf(ff,"%f %f %f\n", mp->GetX(), mp->GetY(), mp->GetZ() );
 	}
 }
+//CMRU 03-09-09-----------------------------------------------------------------------------------------------
+void manualContourModel::SaveData(FILE *ff)
+{
+	std::string etiqueta = GetLabel();
+	if(etiqueta.empty())
+		fprintf(ff,"Label: NO_LABEL\n");
+	else
+		fprintf(ff,"Label: %s\n",etiqueta.c_str());
+	fprintf(ff,"Real_Size: %f\n",GetRealSize());
+}
+
+void manualContourModel::OpenData(FILE *ff)
+{
+	char tmp[255];
+
+	fscanf(ff,"%s",tmp); // Label:
+	fscanf(ff,"%s",tmp); // value
+	std::cout<<tmp<<std::endl;
+	if(tmp != "NO_LABEL")
+		SetLabel(tmp);
+
+	fscanf(ff,"%s",tmp); // Real_size
+	fscanf(ff,"%s",tmp);// #
+
+	//tmp.ToDouble(&tmp);
+	SetRealSize(atof(tmp));
+}
 
+//------------------------------------------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 
@@ -730,9 +706,49 @@ void manualContourModel::AddManualPoint( manualPoint* theManualPoint )//private
 	_lstPoints.push_back( theManualPoint );
 }
 
-std::vector<manualContourModel*> manualContourModel::ExploseModel(  )
+std::vector<manualBaseModel*> manualContourModel::ExploseModel(  )
 {
-	std::vector<manualContourModel*> lstTmp;
+	std::vector<manualBaseModel*> lstTmp;
 	lstTmp.push_back(this);
 	return lstTmp;
 }
+
+
+// ----------------------------------------------------------------------------
+void manualContourModel::Transform_Ax_Plus_B (double Ax, double Bx, double Ay, double By)
+{
+	manualPoint * mp;
+
+	int i, size = GetSizeLstPoints();
+
+	for( i=0; i<size; i++ )
+	{
+		mp = GetManualPoint( i );
+
+		mp->SetPointX( mp->GetX()*Ax + Bx );
+		mp->SetPointY( mp->GetY()*Ay + By );
+	}
+}
+
+
+//CMRU 17-08-09----------------------------------------------------------------------------
+void manualContourModel::SetLabel(std::string newLabel)
+{
+	_label = newLabel;
+}
+
+void manualContourModel::SetRealSize(double newRealSize) 
+{
+	_realSize = newRealSize;
+}
+
+double manualContourModel::GetRealSize()
+{
+	return _realSize;
+}
+
+std::string manualContourModel::GetLabel()
+{
+	return _label;
+}
+//----------------------------------------------------------------------------