X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualContour%2FmanualViewBaseContour.h;h=815a9db16fd1aee2a2b9a933097255095bb53338;hb=5380f9e66daf440f27f33bb060e5ae1a646612cd;hp=a97246c5de0410b92b3411e09d56d39266949c13;hpb=885faee171b5cdcbcbbcb6cc83e6d196544e005c;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.h
index a97246c..815a9db 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.h
@@ -22,8 +22,8 @@
 #include <vtkTextActor.h>
 #include <vtkProperty2D.h>
 #include <vtkPointPicker.h>
-#include "widgets/UtilVtk3DGeometriSelection.h"
-
+//#include "widgets/UtilVtk3DGeometriSelection.h"
+#include "UtilVtk3DGeometriSelection.h"
 #include <vtkCellPicker.h> 
 
 
@@ -50,6 +50,11 @@
 
 
 class creaMaracasVisu_EXPORT manualViewBaseContour{
+
+//---------------------------------------------------
+// PUBLIC METHODS & ATTS
+//---------------------------------------------------
+
 public:
 	manualViewBaseContour();
 	virtual ~manualViewBaseContour();
@@ -59,7 +64,7 @@ public:
 	virtual void Open(FILE *pFile);
 
 	void	AddPoint();
-	void	AddPoint( manualViewPoint * manualViewPoint );
+	virtual void	AddPoint( manualViewPoint * manualViewPoint );
 	void	InsertPoint(int id);
 	void	DeleteContour();
 	void	DeletePoint(int x, int y,int z);
@@ -95,7 +100,7 @@ public:
 	void	UnSelectLstPoints();
 	void	UnSelectAllPoints();
 
-	void	SetModel(manualContourModel *manContModel);
+	void	SetModel(manualBaseModel *manContModel);
 	void	SetWxVtkBaseView(wxVtkBaseView *wxvtkbaseview);
 
 	virtual void	Refresh();
@@ -111,8 +116,8 @@ public:
 	virtual bool	ifTouchContour(int x,int y, int z);
 	void	UpdateColorActor();
 
-	void	SetRange(int range);
-	int		GetRange();
+	void	SetRange(double range);
+	double		GetRange();
 	void	SetZ(int z);
 	int		GetZ();
 
@@ -145,10 +150,11 @@ public:
 	void	RemoveCompleteContourActor();
 	virtual void	AddSplineActor();
 	virtual void	RemoveSplineActor();
-	void	AddControlPoints();
-	void	RemoveControlPoints();	
+	virtual void	AddControlPoints();
+	virtual void	RemoveControlPoints();	
 	void	AddTextActor();
 	void	RemoveTextActor();
+	void InitTextActor();
 
 	virtual manualViewBaseContour * Clone();
 			void					CopyAttributesTo( manualViewBaseContour *cloneObject );
@@ -158,20 +164,27 @@ public:
 
 	virtual void			ConstructVTKObjects();
 
-private:
-	int								_range;
-
-	wxVtkBaseView					*_wxvtkbaseview;
-	bool 							_selected;
-	bool							*_editable;
-	bool							_posibleSelected;
-	bool							_viewControlPoints;
+//---------------------------------------------------
+// PRIVATE METHODS & ATTS
+//---------------------------------------------------
 
+private:
 
 	vtkPolyData						*_pd;
 	vtkActor						*_contourVtkActor;
 	vtkPolyDataMapper				*_bboxMapper;
 
+	void			DeleteVtkObjects();
+	
+
+//---------------------------------------------------
+// PROTECTED METHODS & ATTS
+//---------------------------------------------------
+
+protected:
+
+	double								_range;
+
 	double							_coulorEdit_r;
 	double							_coulorEdit_g;
 	double							_coulorEdit_b;
@@ -183,24 +196,46 @@ private:
 	double							_coulorSelection_b;
 	double							_widthline;
 
-	void			DeleteVtkObjects();
-	virtual void	RefreshText();
-
+	//
+	// Reference to VTKBaseView
+	//
+	wxVtkBaseView					*_wxvtkbaseview;
 
-protected:
+	//
+	// Is the contour selected
+	//
+	bool 							_selected;
+	bool							*_editable;
+	bool							_posibleSelected;
+	bool							_viewControlPoints;
 
 	// text
 	bool							_show_text;
 	int								_id_viewPoint_for_text;
 	vtkTextActor					*_textActor;
-	manualContourModel				*_manContModel;
+
+	//
+	// Contour model
+	//
+	manualBaseModel				*_manContModel;
+
 	vtkPoints						*_pts;
 // JSTG 25-02-08 --------------------------------------------
 	int								_sizePointsContour;
 //-----------------------------------------------------------
+
+	//
+	// Control points list
+	//
 	std::vector<manualViewPoint*>	_lstViewPoints;
+
+	//
+	// Spacing
+	//
 	double							_spc[3];
 
+	virtual void	RefreshText();
+
 };