X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsKernelEditorGraphic%2FwxVtkSceneManager.h;h=e1dccfcfd45f8b357bc143f9e564cc084ddcc409;hb=8fa663b7b47e797e6e23722d1fef41c40419a6d6;hp=f3383ed5600286c079a76898e64bcba9a93a76dc;hpb=ac7e88cf5991d996435b15c7d731b67078f8b2c9;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.h b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.h
index f3383ed..e1dccfc 100644
--- a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.h
+++ b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.h
@@ -43,42 +43,71 @@ Version:   $Revision$
 #ifndef __wxVtkSceneManager_h__
 #define __wxVtkSceneManager_h__
 
-//Includes Same project
-#include "VTKGObjectsFactory.h"
+//Includes same project
+#include "GObjectsMVCFactory.h"
+#include "Observer.h"
+#include "GPortModel.h"
+#include "GConnectorView.h"
+
+//Includes bbtk
+#include <bbtkBlackBoxInputDescriptor.h>
+#include <bbtkBlackBoxDescriptor.h>
 
 //Includes creaMaracasVisu
 #include <wxVtk3DBaseView.h>
 #include <InteractorStyleMaracas.h>
+#include <vtkInteractorStyleBaseView2D.h>
+#include <manualContourControler.h>
+#include <manualContourModel.h>
 
 //Includes vtk
 #include <vtkRenderWindow.h>
 #include <vtkRenderWindowInteractor.h>
 #include <vtkRenderer.h>
+#include <vtkInteractorStyleImage.h>
+
+#include <vtkVectorText.h>
+#include <vtkLinearExtrusionFilter.h>
 
 //Includes std
 #include <iostream>
+#include <map>
+
 
 namespace bbtk
 {
 
-	class wxVtkSceneManager : public InteractorStyleMaracas 
+	class wxVtkSceneManager : public InteractorStyleMaracas , public Observer
 	{
 	public: 
 		wxVtkSceneManager(wxDropTarget *parent, wxVtk3DBaseView *baseView, int id);
 		~wxVtkSceneManager();
 
 		void configureBaseView();
-		void createGBlackBox();
+		void createGBlackBox(int x, int y,std::string packageName, std::string boxName);
+		void createGInputPort(BlackBoxInputDescriptor *desc,GBlackBoxModel *blackBox, int pos);
+		void createGOutputPort(BlackBoxOutputDescriptor *desc,GBlackBoxModel *blackBox, int pos);
+		void createGConnector(GPortModel* startPort);
+
 		void registerController(InteractorStyleMaracas *param);
 
 		vtkRenderWindow* getRenderWindow();
 		vtkRenderer* getRenderer();
+
+		void disconnectDrop();
+		
+		virtual bool OnMouseMove();
+
+		virtual void update(int command);
 		
 	private:
 
 		int _id;
 		wxVtk3DBaseView *_baseView;
 
+		std::vector<GObjectModel*> _objects;
+		std::vector<GObjectModel*> _selectedObjects;
+
 	protected:
 
 	};