X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsKernelEditorGraphic%2FwxVtkSceneManager.h;h=5079fdc643307eea8b63b620d23987292a53999d;hb=a6d479881eeb637cd06afa3b2177e430fa05571e;hp=d272f60ac5e2a37ee22782eb2fd78c5f0b0efc86;hpb=cef73d418644dcb545c7731df11c54146fe82174;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.h b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.h
index d272f60..5079fdc 100644
--- a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.h
+++ b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.h
@@ -45,6 +45,15 @@ Version:   $Revision$
 
 //Includes same project
 #include "GObjectsMVCFactory.h"
+#include "Observer.h"
+#include "GPortModel.h"
+#include "GConnectorView.h"
+#include "GConnectorModel.h"
+#include "GConnectorController.h"
+#include "vtkGPortView.h"
+#include "manualConnectorContourView.h"
+#include "manualConnectorContourController.h"
+#include "wxGEditorTabPanel.h"
 
 //Includes bbtk
 #include <bbtkBlackBoxInputDescriptor.h>
@@ -54,6 +63,8 @@ Version:   $Revision$
 #include <wxVtk3DBaseView.h>
 #include <InteractorStyleMaracas.h>
 #include <vtkInteractorStyleBaseView2D.h>
+#include <manualContourControler.h>
+#include <manualContourModel.h>
 
 //Includes vtk
 #include <vtkRenderWindow.h>
@@ -61,6 +72,7 @@ Version:   $Revision$
 #include <vtkRenderer.h>
 #include <vtkInteractorStyleImage.h>
 
+
 //Includes std
 #include <iostream>
 #include <map>
@@ -68,36 +80,68 @@ Version:   $Revision$
 
 namespace bbtk
 {
+	class wxGEditorTabPanel;
 
-	class wxVtkSceneManager : public InteractorStyleMaracas 
+	class wxVtkSceneManager : public InteractorStyleMaracas , public Observer
 	{
 	public: 
-		wxVtkSceneManager(wxDropTarget *parent, wxVtk3DBaseView *baseView, int id);
+		wxVtkSceneManager(wxGEditorTabPanel *parent, wxVtk3DBaseView *baseView, int idManager);
 		~wxVtkSceneManager();
 
 		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 createGBlackBox(int x, int y,std::string packageName, std::string boxType);
+		void createGPort(int portType, std::string bbtkName, std::string bbtkType, 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);
+		void unregisterController(InteractorStyleMaracas *param);
 
 		vtkRenderWindow* getRenderWindow();
 		vtkRenderer* getRenderer();
+
 		void disconnectDrop();
+		
+		virtual bool OnChar();
 		virtual bool OnMouseMove();
+		virtual bool  OnLeftButtonDown(); 
+		virtual bool  OnLeftButtonUp();
+		virtual bool OnRightButtonUp();
+
+		virtual void update(int idController,int command);
+
+		void displayBlackBoxInfo(std::string packageName, std::string boxName);
+		void updateStatusBar(std::string textStatus);
+		std::string getDiagramScript();
+		void removeObject(int id);
 
 		
 	private:
 
-		int _id;
+		wxGEditorTabPanel *_parent;
+
+		// Last controller created
+		int _idLastController;
+
+		// Id of the manager, the same of the panel
+		int _idManager;
+
+		// Boxes number in the scene
+		int _numBoxes;
+
+		// StartDragging
+		bool _startDragging;
+
 		wxVtk3DBaseView *_baseView;
-		std::vector<GObjectModel*> objects;
-		std::vector<GObjectModel*> selectedObjects;
 
-		void refreshRenderWindow();
+		int _worldState;
+
+		std::map<int,GObjectController*> _controllers;
+
+		//Saves the id's of the selected objects in the controllers map
+		std::vector<int> _selectedObjects;
 
-		//ERASE
-		int cantTemp;
 	protected:
 
 	};