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=5819d6c7dcbc391fd814086d77b1eb80dd8d4595;hpb=0794f161828e0602d361e1c0760b745d688496b9;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 5819d6c..b43941d 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualBaseModel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualBaseModel.cpp
@@ -1,18 +1,45 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 #include "manualBaseModel.h"
 
 // ----------------------------------------------------------------------------
 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();
@@ -67,7 +94,6 @@ int manualBaseModel::InsertPoint(double x,double y,double z)
 		}
 	}
 
-
 	InsertPoint_id(ibak,x,y,z);
 
 	return ibak;
@@ -119,7 +145,6 @@ void manualBaseModel::MoveAllPoints(double dx,double dy,double dz)
 	}
 }
 
-
 // ----------------------------------------------------------------------------
 // type=-1  x,y,z
 // type=0	y,z
@@ -184,7 +209,7 @@ int	 manualBaseModel::GetIdPoint(double x, double y, double z, int i_range,int t
 // ----------------------------------------------------------------------------
 int	 manualBaseModel::IsPoint(double x, double y)
 {
-	double xx,yy,zz;
+	double xx,yy/*,zz*/;
 	bool exists=false;
 	int i,size=_lstPoints.size();
 	for (i=0;i<size;i++){
@@ -199,7 +224,6 @@ int	 manualBaseModel::IsPoint(double x, double y)
 		}
 	}
 	return exists;
-
 }
 // ----------------------------------------------------------------------------
 manualPoint* manualBaseModel::GetManualPoint(int id)
@@ -245,20 +269,20 @@ void manualBaseModel::CopyAttributesTo( manualBaseModel * cloneObject)
 	}
 }
 
-
 // ---------------------------------------------------------------------------
 void manualBaseModel::AddManualPoint( manualPoint* theManualPoint )
 {
 	_lstPoints.push_back( theManualPoint );
 }
-
+// ---------------------------------------------------------------------------
 void manualBaseModel::Open(FILE *ff)	// virtual
 {
 }
+// ---------------------------------------------------------------------------
 void manualBaseModel::Save(FILE *ff)	// virtual
 {
 }
-
+// ---------------------------------------------------------------------------
 void manualBaseModel::SaveData(FILE *ff)// virtual
 {
 }
@@ -269,16 +293,16 @@ void manualBaseModel::SetNumberOfPointsSpline(int size)
 {
 	_sizePointsContour = size;
 }
-
-double manualBaseModel::GetPathSize()
+// ---------------------------------------------------------------------------
+double manualBaseModel::GetPathSize(double *spc)
 {
 	return 0.0;
 }
-
+// ---------------------------------------------------------------------------
 void manualBaseModel::Transform_Ax_Plus_B (double Ax, double Bx, double Ay, double By)
 {
 }
-
+// ---------------------------------------------------------------------------
 void manualBaseModel::GetSpline_i_Point(int i, double *x, double *y, double *z)
 {
 	//RaC 20-09-09 IF it's a points contour
@@ -297,9 +321,7 @@ void manualBaseModel::GetSpline_i_Point(int i, double *x, double *y, double *z)
 			*y	= mp->GetY();
 			*z	= mp->GetZ();
 		}
-
 	}
-
 }
 
 void manualBaseModel::GetSpline_t_Point(double t, double *x, double *y, double *z)
@@ -331,24 +353,21 @@ std::vector<manualBaseModel*> manualBaseModel::ExploseModel(  )
 }
 
 // ---------------------------------------------------------------------------
-double			manualBaseModel::GetPathArea()
+double manualBaseModel::GetPathArea( double *spc )
 {
 	return 0.0;
 }
-void			manualBaseModel::GetNearestPointAndNormal(double *p, double *rp,  double *rn)
+void manualBaseModel::GetNearestPointAndNormal(double *p, double *rp,  double *rn)
 {
 }
-void			manualBaseModel::SetCloseContour(bool closeContour)
+void manualBaseModel::SetCloseContour(bool closeContour)
 {
 }
-bool			manualBaseModel::IfCloseContour()
+bool manualBaseModel::IfCloseContour()
 {
 	return false;
 }
 //CMRU 17-08-09----------------------------------------------------------------------------
-void manualBaseModel::SetLabel(std::string newLabel)
-{
-}
 
 void manualBaseModel::SetRealSize(double newRealSize) 
 {
@@ -359,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;
 }
+
+
+
 //----------------------------------------------------------------------------