X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsKernelEditorGraphic%2FwxVtkSceneManager.h;h=f539e92ea3732e2fa315c59baad635c6839b2d4e;hb=878ac6ad472bc459f4e364c16890e5026c401944;hp=a55094814592a9ee0b26cc69054310a4f4dd62c2;hpb=098558ac7780900858114a8ae01fe93847d67043;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.h b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.h
index a550948..f539e92 100644
--- a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.h
+++ b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.h
@@ -45,6 +45,10 @@ Version:   $Revision$
 
 //Includes same project
 #include "GObjectsMVCFactory.h"
+#include "Observer.h"
+#include "GPortModel.h"
+#include "vtkGPortView.h"
+#include "GConnectorView.h"
 
 //Includes bbtk
 #include <bbtkBlackBoxInputDescriptor.h>
@@ -53,6 +57,9 @@ Version:   $Revision$
 //Includes creaMaracasVisu
 #include <wxVtk3DBaseView.h>
 #include <InteractorStyleMaracas.h>
+#include <vtkInteractorStyleBaseView2D.h>
+#include <manualContourControler.h>
+#include <manualContourModel.h>
 
 //Includes vtk
 #include <vtkRenderWindow.h>
@@ -60,6 +67,9 @@ Version:   $Revision$
 #include <vtkRenderer.h>
 #include <vtkInteractorStyleImage.h>
 
+#include <vtkVectorText.h>
+#include <vtkLinearExtrusionFilter.h>
+
 //Includes std
 #include <iostream>
 #include <map>
@@ -68,7 +78,7 @@ Version:   $Revision$
 namespace bbtk
 {
 
-	class wxVtkSceneManager : public InteractorStyleMaracas 
+	class wxVtkSceneManager : public InteractorStyleMaracas , public Observer
 	{
 	public: 
 		wxVtkSceneManager(wxDropTarget *parent, wxVtk3DBaseView *baseView, int id);
@@ -76,25 +86,30 @@ namespace bbtk
 
 		void configureBaseView();
 		void createGBlackBox(int x, int y,std::string packageName, std::string boxName);
-		void createGInputPort(BlackBoxInputDescriptor *desc,GBlackBoxModel *blackBox);
-		void createGOutputPort(BlackBoxOutputDescriptor *desc,GBlackBoxModel *blackBox);
+		void createGPort(int portType, int posinBox,GBlackBoxModel *blackBox);
+		void createGInputPort(int portType, int posinBox,GBlackBoxModel *blackBox, BlackBoxInputDescriptor *desc);
+		void createGOutputPort(int portType, int posinBox,GBlackBoxModel *blackBox, BlackBoxOutputDescriptor *desc);
+		void createGConnector(GPortModel* startPort);
+
 		void registerController(InteractorStyleMaracas *param);
 
 		vtkRenderWindow* getRenderWindow();
 		vtkRenderer* getRenderer();
+
 		void disconnectDrop();
+		
 		virtual bool OnMouseMove();
 
+		virtual void update(int idObservable,int command);
 		
 	private:
 
 		int _id;
 		wxVtk3DBaseView *_baseView;
 
-		void refreshRenderWindow();
+		std::vector<GObjectController*> _objects;
+		std::map<int,GObjectController*> _controllers;
 
-		//ERASE
-		int cantTemp;
 	protected:
 
 	};