X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsVtkGUIEditorGraphic%2FvtkGObjectView.h;h=2f6e14ded6de95ef8ba5d200384951546a9581d9;hb=f6286f6851a4c0757cbacbee679d31bcc5a933bd;hp=d07a3fd7def5884e6ed6e2b5241b15009ea07276;hpb=e628a3dc4645cb347ebf060b145e626cc31a65f4;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.h b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.h
index d07a3fd..2f6e14d 100644
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.h
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.h
@@ -35,10 +35,11 @@ Version:   $Revision$
 *  \brief Class bbtk::vtkGObjectView : abstract black-box interface. 
 */
 
-/**
-* \class bbtk::vtkGObjectView
-* \brief 
-*/
+/****
+* Design and Developpement of BBTK GEditor
+* Ricardo A Corredor J <ra.corredor67@uniandes.edu.co>
+* RaC - 2010
+****/
 
 #ifndef __vtkGObjectView_h__
 #define __vtkGObjectView_h__
@@ -76,24 +77,32 @@ namespace bbtk
 		~vtkGObjectView();
 		
 		//Public methods
+
 		void setModel(GObjectModel *model);
 		void setBaseView(wxVtkBaseView* baseView);
 		void initVtkObjects();
 		
-		virtual bool isPointInside(int X,int Y);
-		virtual void moveObject(int X, int Y);
-
-		virtual void update(int idController,int command);
-		void isStartDragging(bool param);
+		void setStartDragging(bool param);
 
 		void setState(int state);
 		int getState();
+
+		// Method to force a vtk refresh to the list of controllers of the wxVtkBaseView
 		void setRefreshWaiting();
+		
+		virtual bool isPointInside(int X,int Y);
+		virtual void moveObject(int X, int Y);
 
+		virtual void removeFromScene();
+
+		virtual void update(int idController,int command);		
+		
 	private:
 
 		//Private Attributes
 		bool _isStartDragging;
+
+		//Makes a difference between the first point clicked and the new position, in order to move the selected objects
 		double dragDifX;
 		double dragDifY;
 
@@ -103,14 +112,23 @@ namespace bbtk
 	protected:
 
 		//Protected Attributes
-		wxVtkBaseView *_baseView;
-		GObjectModel *_model;
-		vtkActor *_objectActor;
+		
+		wxVtkBaseView		* _baseView;
+		GObjectModel		* _model;
+		vtkActor			* _borderObjectActor;
+		vtkActor			* _fillObjectActor;
+		vtkPolyDataMapper	* _fillPolyMapper;
+		vtkPolyDataMapper	* _borderPolyMapper;
+
+		vtkPoints			*_pts;
+
+		// State of the object (See GlobalConstants.h)
 		int  _state;
 		
 		//Protected Methods
 		virtual void createVtkObjects();
 		virtual void addVtkActors();
+		virtual void removeVtkActors();
 		virtual void updateColors();
 	};