X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualContour%2FmanualBaseModel.cpp;h=b43941d7cb79d89b474543ae890f5209e06dd312;hb=15112ae15da4222831b0e8e7c9be87daf9e99a1c;hp=1d55f5a2672c7b0a4b2af45d5f5b49597603f998;hpb=e4ef2b5df5aac431ff3b806f83b7dd5e55e89d86;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualBaseModel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualBaseModel.cpp
index 1d55f5a..b43941d 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualBaseModel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualBaseModel.cpp
@@ -28,16 +28,18 @@
 // ----------------------------------------------------------------------------
 manualBaseModel::manualBaseModel()
 {
-
-	_sizePointsContour	= 100;			//JSTG 25-02-08 The change in the inisialization of these variable is critical.
-
+//EED2017
+	_sizePointsContour	= 500;			//JSTG 25-02-08 The change in the inisialization of these variable is critical.
+	_label				= "";
+	_label2				= "--";
 }
 
 // ----------------------------------------------------------------------------
 manualBaseModel::~manualBaseModel()
 {
 	int i,size=_lstPoints.size();
-	for (i=0;i<size; i++){
+	for (i=0;i<size; i++)
+	{
 		delete _lstPoints[i];
 	}
 	_lstPoints.clear();
@@ -292,7 +294,7 @@ void manualBaseModel::SetNumberOfPointsSpline(int size)
 	_sizePointsContour = size;
 }
 // ---------------------------------------------------------------------------
-double manualBaseModel::GetPathSize()
+double manualBaseModel::GetPathSize(double *spc)
 {
 	return 0.0;
 }
@@ -351,7 +353,7 @@ std::vector<manualBaseModel*> manualBaseModel::ExploseModel(  )
 }
 
 // ---------------------------------------------------------------------------
-double manualBaseModel::GetPathArea()
+double manualBaseModel::GetPathArea( double *spc )
 {
 	return 0.0;
 }
@@ -366,9 +368,6 @@ bool manualBaseModel::IfCloseContour()
 	return false;
 }
 //CMRU 17-08-09----------------------------------------------------------------------------
-void manualBaseModel::SetLabel(std::string newLabel)
-{
-}
 
 void manualBaseModel::SetRealSize(double newRealSize) 
 {
@@ -379,11 +378,30 @@ double manualBaseModel::GetRealSize()
 	return -1;
 }
 
+void manualBaseModel::OpenData(FILE *ff)
+{
+}
+
+void manualBaseModel::SetLabel(std::string newLabel)
+{
+	_label = newLabel;
+}
+
 std::string manualBaseModel::GetLabel()
 {
-	return "";
+	return _label;
 }
-void manualBaseModel::OpenData(FILE *ff)
+
+void manualBaseModel::SetLabel2(std::string newLabel)
 {
+	_label2 = newLabel;
 }
+
+std::string manualBaseModel::GetLabel2()
+{
+	return _label2;
+}
+
+
+
 //----------------------------------------------------------------------------