X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualContour%2FmanualContourBaseControler.h;h=2c5f8935ace4fc7e3a4f9725b8117abef21b1f2a;hb=65c158dc171f8d3114ee3544b2a94a1f41880df0;hp=eb1ef54d9ba5cab71026a5fec1df2bf85dece8e0;hpb=414da1a291ff4c9d9a946536d3d219e4b5f9e6c2;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourBaseControler.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourBaseControler.h
index eb1ef54..2c5f893 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourBaseControler.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourBaseControler.h
@@ -31,9 +31,10 @@
 #include <vtkTextActor.h>
 #include <vtkProperty2D.h>
 #include <vtkPointPicker.h>
-#include "widgets/UtilVtk3DGeometriSelection.h"
-#include "widgets/InteractorStyleMaracas.h"
-
+//#include "widgets/UtilVtk3DGeometriSelection.h"
+#include "UtilVtk3DGeometriSelection.h"
+//#include "widgets/InteractorStyleMaracas.h"
+#include "InteractorStyleMaracas.h"
 
 #include "wxVTKRenderWindowInteractor.h"
 
@@ -71,8 +72,8 @@ public:
 	virtual bool  OnRightButtonDown();
 	virtual bool  OnRightButtonUp();
 
-	void	SetModelView(manualContourModel *manContModel, manualViewBaseContour *manViewBaseCont);
-	manualContourModel		* GetManualContourModel();
+	void	SetModelView(manualBaseModel *manContModel, manualViewBaseContour *manViewBaseCont);
+	manualBaseModel		* GetManualContourModel();
 	manualViewBaseContour	* GetManualViewBaseContour();
 
 
@@ -86,7 +87,7 @@ public:
 	void	SetState(int state);
 	int		GetState();
 	bool	IsEditable();
-	void	SetEditable(  bool condition  );
+	virtual void	SetEditable(  bool condition  );
 	bool	GetPosibleToMove();
 	void	SetPosibleToMove(  bool condition  );
 	bool	IsMoving();
@@ -108,6 +109,10 @@ public:
 	void	SetZ(int z);
 	virtual int		GetZ();
 
+	// VIRTUAL - Adds a point in an specified position
+	// @param x - int
+	// @param y - int
+	// @param z - int
 	virtual void	AddPoint(int x, int y, int z);
 	virtual void	InsertPoint(int x, int y, int z);
 
@@ -126,9 +131,13 @@ public:
 //	virtual manualContourBaseControler * Clone( manualViewBaseContour * cloneView = NULL, manualContourModel * cloneModel = NULL );
 
 
-private:
+protected:
+	
+	// Reference to the contour or element view 
 	manualViewBaseContour	*_manViewBaseCont;
-	manualContourModel		*_manContModel;
+
+	// Reference to the model contour or element model 
+	manualBaseModel		*_manContModel;
 
 	int						_z;
 	int						_state;