X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualContour%2FmanualBaseModel.h;h=25057a2bf126302ecd3c59d44a0a3ed068c8dd02;hb=9a8f7c9cb08ffcb57f1558b9d20f7fbcd95df017;hp=f8adbefb811bf7ec126209d634d875ec302eaae2;hpb=e4ef2b5df5aac431ff3b806f83b7dd5e55e89d86;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualBaseModel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualBaseModel.h
index f8adbef..25057a2 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualBaseModel.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualBaseModel.h
@@ -42,7 +42,7 @@
 #include <vtkDataSetMapper.h>
 #include <vtkUnstructuredGrid.h>
 
-#include "wxVTKRenderWindowInteractor.h"
+#include "creawxVTKRenderWindowInteractor.h"
 
 #include <vector>
 #include "wxVtkBaseView.h"
@@ -84,9 +84,9 @@ public:
 	virtual int				GetIdPoint(double x, double y, double z, int i_range,int type);
 	virtual manualPoint*	GetManualPoint(int id);
 	virtual int				GetSizeLstPoints();
-	virtual double			GetPathSize();
+	virtual double			GetPathSize(double *spc);
 	virtual void			Transform_Ax_Plus_B (double Ax, double Bx, double Ay, double By);
-	virtual void	GetSpline_i_Point(int i, double *x, double *y, double *z);
+	virtual void			GetSpline_i_Point(int i, double *x, double *y, double *z);
 	virtual void			GetSpline_t_Point(double t, double *x, double *y, double *z);
 
 	//
@@ -94,14 +94,14 @@ public:
 	// @return int - spline points size
 	//
 	virtual int				GetNumberOfPointsSpline();
-	virtual void	UpdateSpline();
+	virtual void			UpdateSpline();
 
 	//
 	// Returns a list with the actual model
 	// @return std::vector<manualBaseModel*>
 	//
 	virtual std::vector<manualBaseModel*> ExploseModel(  );
-	virtual double			GetPathArea();
+	virtual double			GetPathArea(double *spc);
 	virtual void			GetNearestPointAndNormal(double *p, double *rp,  double *rn);
 
 	virtual void			SetCloseContour(bool closeContour);
@@ -124,7 +124,10 @@ public:
 	* Assigns the parameter value to the label
 	* @param newLabel New label of the contour
 	*/
-	virtual void SetLabel(std::string newLabel);
+	void SetLabel(std::string newLabel);
+	std::string GetLabel();
+	void SetLabel2(std::string newLabel);
+	std::string GetLabel2();
 	
 	/*
 	* Assigns the parameter value to the real size
@@ -132,10 +135,6 @@ public:
 	*/
 	virtual void SetRealSize(double newRealSize);
 	
-	/**
-	* Returns the label of the contour
-	*/
-	virtual std::string GetLabel();
 
 	/**
 	* Returns the real size in milimeters of the contour
@@ -158,6 +157,12 @@ protected:
 	int							_sizePointsContour;
 	std::vector<manualPoint*>	_lstPoints;
 
+	/**
+	* Represents the label associated with the contour
+	*/
+	std::string					_label;
+	std::string					_label2;
+
 };