X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualContour%2FmanualContourModel.h;h=4493ed5b38b09612af60f56d5f76b6b4eb8efc6b;hb=ca35b13e046343c8b50cbd6b833828b06c9d1608;hp=ca053fdbce90c6ff38b98824c8f8599fb3ac82ad;hpb=865d74f8d9ea0b80a3bc4de0be2b73d85399c2b5;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.h
index ca053fd..4493ed5 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.h
@@ -46,7 +46,7 @@
 #include <vtkDataSetMapper.h>
 #include <vtkUnstructuredGrid.h>
 
-#include "wxVTKRenderWindowInteractor.h"
+#include "creawxVTKRenderWindowInteractor.h"
 
 
 //--
@@ -103,8 +103,8 @@ public:
 	//void			GetSplinePoint(double t, double &x, double &y, double &z);	//Method Original
 	//void			GetSplineiPoint(int i, double &x, double &y, double &z);	//Method Original
 //-------------------------------------------------------------------------------
-	virtual double			GetPathSize();
-	virtual double			GetPathArea();
+	virtual double			GetPathSize(double *spc);
+	virtual double			GetPathArea(double *spc);
 
 	void					GetNearestPointAndNormal(double *p, double *rp,  double *rn);
 	
@@ -117,11 +117,6 @@ public:
 
 // CMRU 17-08-09 -----------------------------------------------------------------
 	
-	/*
-	* Assigns the parameter value to the label
-	* @param newLabel New label of the contour
-	*/
-	void SetLabel(std::string newLabel);
 	
 	/*
 	* Assigns the parameter value to the real size
@@ -129,11 +124,6 @@ public:
 	*/
 	void SetRealSize(double newRealSize);
 	
-	/**
-	* Returns the label of the contour
-	*/
-	std::string GetLabel();
-
 	/**
 	* Returns the real size in milimeters of the contour
 	*/
@@ -161,19 +151,15 @@ public:
     vtkKochanekSpline			*_cntSplineZ;
 
 //JSTG 25-02-08 ----------------------------------------
-	double			_delta_JSTG;
+	double						_delta_JSTG;
 //------------------------------------------------------
 
 //CMRU 17-08-09 -----------------------------------------------------------------
 	/**
 	* Represents the real size in milimeters of the contour
 	*/
-	double			_realSize;
+	double						_realSize;
 
-	/**
-	* Represents the label associated with the contour
-	*/
-	std::string		_label;
 //--------------------------------------------------------------------------------
 
 };