X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualContour%2FmanualViewBaseContour.h;h=be5976a1d1c2c059b0758856218f77089f15e9e9;hb=15112ae15da4222831b0e8e7c9be87daf9e99a1c;hp=d773a7e3b9e4c63acf57ea4613dad1fa50c05c42;hpb=c207afb3b26146b6286e2492ba23a744e3a2e1d2;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 d773a7e..be5976a 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.h
@@ -57,7 +57,7 @@
 #include <vtkDataSetMapper.h>
 #include <vtkUnstructuredGrid.h>
 
-#include "wxVTKRenderWindowInteractor.h"
+#include "creawxVTKRenderWindowInteractor.h"
 
 
 //--
@@ -74,7 +74,8 @@
 // ----------------------------------------------------------------------------
 
 
-class creaMaracasVisu_EXPORT manualViewBaseContour{
+class creaMaracasVisu_EXPORT manualViewBaseContour
+{
 
 //---------------------------------------------------
 // PUBLIC METHODS & ATTS
@@ -130,7 +131,7 @@ public:
 
 	virtual void	Refresh();
 	int		GetNumberOfPoints();						// ??? 
-	//int		GetNumberOfPointsSpline();				//JSTG 25-02-08 In ContourModel is the same method 
+	//int	GetNumberOfPointsSpline();					//JSTG 25-02-08 In ContourModel is the same method 
 	//void	SetNumberOfPointsSpline(int size);			//JSTG 25-02-08 In ContourModel is the same method 
 
 	void	CreateNewContour();
@@ -142,7 +143,7 @@ public:
 	void	UpdateColorActor();
 
 	void	SetRange(double range);
-	double		GetRange();
+	double	GetRange();
 	void	SetZ(int z);
 	int		GetZ();
 
@@ -187,19 +188,22 @@ public:
 			void					SetWidthLine(double width);
 			double					GetWidthLine();
 
-	virtual void			ConstructVTKObjects();
+	virtual void					ConstructVTKObjects();
 
+	void SetCellArray(bool type);
 //---------------------------------------------------
 // PRIVATE METHODS & ATTS
 //---------------------------------------------------
 
 private:
 
-	vtkPolyData						*_pd;
-	vtkActor						*_contourVtkActor;
-	vtkPolyDataMapper				*_bboxMapper;
+	vtkPolyData							*_pd;
+	vtkCellArray 						*_splineCell;
+	vtkCellArray 						*_lineCell;
+	vtkActor							*_contourVtkActor;
+	vtkPolyDataMapper					*_bboxMapper;
 
-	void			DeleteVtkObjects();
+	void								DeleteVtkObjects();
 	
 
 //---------------------------------------------------
@@ -208,46 +212,46 @@ private:
 
 protected:
 
-	double					_range;
+	double								_range;
 
-	double					_coulorEdit_r;
-	double					_coulorEdit_g;
-	double					_coulorEdit_b;
-	double					_coulorNormal_r;
-	double					_coulorNormal_g;
-	double					_coulorNormal_b;
-	double					_coulorSelection_r;
-	double					_coulorSelection_g;
-	double					_coulorSelection_b;
-	double					_widthline;
+	double								_coulorEdit_r;
+	double								_coulorEdit_g;
+	double								_coulorEdit_b;
+	double								_coulorNormal_r;
+	double								_coulorNormal_g;
+	double								_coulorNormal_b;
+	double								_coulorSelection_r;
+	double								_coulorSelection_g;
+	double								_coulorSelection_b;
+	double								_widthline;
 
 	//
 	// Reference to VTKBaseView
 	//
-	wxVtkBaseView				*_wxvtkbaseview;
+	wxVtkBaseView						*_wxvtkbaseview;
 
 	//
 	// Is the contour selected
 	//
-	bool 					_selected;
-	bool					*_editable;
-	bool					_posibleSelected;
-	bool					_viewControlPoints;
+	bool 								_selected;
+	bool								*_editable;
+	bool								_posibleSelected;
+	bool								_viewControlPoints;
 
 	// text
-	bool					_show_text;
-	int					_id_viewPoint_for_text;
-	vtkTextActor				*_textActor;
-	vtkTextActor				*_textActor2;
+	bool								_show_text;
+	int									_id_viewPoint_for_text;
+	vtkTextActor						*_textActor;
+	vtkTextActor						*_textActor2;
 
 	//
 	// Contour model
 	//
-	manualBaseModel				*_manContModel;
+	manualBaseModel						*_manContModel;
 
-	vtkPoints				*_pts;
+	vtkPoints							*_pts;
 // JSTG 25-02-08 --------------------------------------------
-	int					_sizePointsContour;
+	int									_sizePointsContour;
 //-----------------------------------------------------------
 
 	//
@@ -258,7 +262,7 @@ protected:
 	//
 	// Spacing
 	//
-	double					_spc[3];
+	double								_spc[3];
 
 	virtual void	RefreshText();