X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualContour%2FmanualContourBaseControler.h;h=4fece95ed380c68131eeb03d8b0a99c2c93ba6b5;hb=e263b7ace0f53d647a731553a3f67700838ad146;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..4fece95 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourBaseControler.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourBaseControler.h
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 #ifndef manualContourBaseControler_h
 #define manualContourBaseControler_h
 
@@ -31,11 +56,12 @@
 #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"
+#include "creawxVTKRenderWindowInteractor.h"
 
 
 //--
@@ -71,8 +97,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 +112,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 +134,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 +156,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;