X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsVtkGUIEditorGraphic%2FvtkGObjectView.h;h=691d2ef3290690c5887ebc58badc5272d261222d;hb=3babfd57a9b4b3cffba34415e928239592e7d4a1;hp=5c15592c3bc160911387dda6fa2527f933a3335c;hpb=522d684c97b10743148e2fbf2371cd02ff1fa42e;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.h b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.h
index 5c15592..691d2ef 100644
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.h
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.h
@@ -46,13 +46,14 @@ Version:   $Revision$
 //Includes same project
 #include "GlobalConstants.h"
 #include "GObjectModel.h"
+#include "Observer.h"
 
 //Includes creaMaracasVisu
 #include <wxVtkBaseView.h>
+#include <vtkInteractorStyleBaseView.h>
 
 //Includes vtk
 #include <vtkRenderer.h>
-
 #include "vtkConeSource.h"
 #include "vtkPolyDataMapper.h"
 #include "vtkActor.h"
@@ -65,7 +66,7 @@ Version:   $Revision$
 namespace bbtk
 {
 
-	class vtkGObjectView 
+	class vtkGObjectView : public Observer
 	{
 
 	public: 
@@ -79,13 +80,23 @@ namespace bbtk
 		void setBaseView(wxVtkBaseView* baseView);
 		void initVtkObjects();
 		
-		bool isPointInside(int X,int Y);
+		virtual bool isPointInside(int X,int Y);
+		virtual void moveObject(int X, int Y);
+
+		virtual void update(int idController,int command);
+		void setStartDragging(bool param);
 
-		virtual void refresh();
+		void setState(int state);
+		int getState();
+		void setRefreshWaiting();
 
 	private:
 
 		//Private Attributes
+		bool _isStartDragging;
+		double dragDifX;
+		double dragDifY;
+
 
 		//Private Methods
 		
@@ -94,11 +105,17 @@ namespace bbtk
 		//Protected Attributes
 		wxVtkBaseView *_baseView;
 		GObjectModel *_model;
-		vtkActor *_objectActor;
-
+		vtkActor *_borderObjectActor;
+		vtkActor *_fillObjectActor;
+		vtkPolyDataMapper* _fillPolyMapper;
+		vtkPolyDataMapper* _borderPolyMapper;
+		vtkPoints *_pts;
+		int  _state;
+		
 		//Protected Methods
 		virtual void createVtkObjects();
 		virtual void addVtkActors();
+		virtual void updateColors();
 	};