X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsKernelEditorGraphic%2FwxVtkSceneManager.h;h=c6f7a6b11468719bec613bf3d7e03722b71d654b;hb=50851761f4216d932217db8e8fe56dd5aac6b0fb;hp=38552dbe7fe0e3ff0860a1168fb190097becddaa;hpb=e628a3dc4645cb347ebf060b145e626cc31a65f4;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.h b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.h
index 38552db..c6f7a6b 100644
--- a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.h
+++ b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.h
@@ -47,8 +47,13 @@ Version:   $Revision$
 #include "GObjectsMVCFactory.h"
 #include "Observer.h"
 #include "GPortModel.h"
-#include "vtkGPortView.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>
@@ -67,8 +72,6 @@ Version:   $Revision$
 #include <vtkRenderer.h>
 #include <vtkInteractorStyleImage.h>
 
-#include <vtkVectorText.h>
-#include <vtkLinearExtrusionFilter.h>
 
 //Includes std
 #include <iostream>
@@ -77,11 +80,12 @@ Version:   $Revision$
 
 namespace bbtk
 {
+	class wxGEditorTabPanel;
 
 	class wxVtkSceneManager : public InteractorStyleMaracas , public Observer
 	{
 	public: 
-		wxVtkSceneManager(wxDropTarget *parent, wxVtk3DBaseView *baseView, int id);
+		wxVtkSceneManager(wxGEditorTabPanel *parent, wxVtk3DBaseView *baseView, int idManager);
 		~wxVtkSceneManager();
 
 		void configureBaseView();
@@ -99,17 +103,39 @@ namespace bbtk
 		void disconnectDrop();
 		
 		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);
 		
 	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<GObjectController*> _objects;
+		int _worldState;
+
 		std::map<int,GObjectController*> _controllers;
 
+		//Saves the id's of the selected objects in the controllers map
+		std::vector<int> _selectedObjects;
+
 	protected:
 
 	};