X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsWxGUIEditorGraphic%2FwxVtkSceneManager.h;h=fe5889c831a0ec357c4f3a2694a05dba54ee992e;hb=806f5f22eb6e0e3d33e9f5e63efc13bd16d616a7;hp=d7a4011f53530bd0a5bd3c28582da4a17fd08f1d;hpb=56cbba59d070c955c4aab46e59908ab82f5e390d;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.h b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.h
index d7a4011..fe5889c 100644
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.h
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.h
@@ -82,9 +82,10 @@ Version:   $Revision$
 
 //Includes std
 #include <iostream>
+#include <string>
+#include <sstream>
 #include <map>
 
-
 namespace bbtk
 {
 	class wxGEditorTabPanel;
@@ -108,6 +109,8 @@ namespace bbtk
 		virtual bool OnLeftButtonUp();
 		virtual bool OnRightButtonUp();
 		virtual bool OnLeftDClick();
+                virtual bool OnMiddleButtonDown(); ///JLGR 21-05-2012
+                virtual bool OnMiddleButtonUp(); ///JLGR 21-05-2012
 
 		//-------
 		int createGBlackBox(int x, int y, std::string packageName, std::string boxType );
@@ -119,7 +122,7 @@ namespace bbtk
 		int createGConnector(GPortModel* startPort);
 
 		void configGBlackBox(int idBox, double xIn, double yIn, double zIn, std::string name, bool boxExecutable,double xEn,double yEn,double zEn);
-		void configGConnetion( std::string nameStartBox, std::string  nameStartPort, std::string
+		int configGConnetion( std::string nameStartBox, std::string  nameStartPort, std::string
 							  nameEndBox, std::string  nameEndPort);
 		void configGComBoxInputOutputPort(bool inputoutput, std::string inputPortName, double xIn, double yIn,double zIn);
 		GBoxModel* findGBox(std::string boxname);
@@ -160,13 +163,18 @@ namespace bbtk
 		//Add a map of object controllers
 		void addObjects(std::map<int,GObjectController*> objectsMap);
 
+                /// Duplicates Objects to current a diagram
+                void DuplicateObjects(std::map<int,GObjectController*> objectsMap);///JLGR 21-05-2012
 
+		//-------
+		// Makes a BlackBox Executable
+		bool MakeBoxExecutable();//DFCH
 		//-------
 		//Returns a string with the BBS script of the current diagram.
 		std::string getDiagramBBS(bool wln=false);
 
 		//Returns a string with the BBS script of the complex box.
-		std::string saveComplexBoxBBS(std::string cbName,std::string cbAuthor="",std::string cbCategory="",std::string cbDescription="");
+		std::string saveComplexBoxBBS();
 
 		//Delete the object in the list of controllers with the id given by parameter.
 		void deleteObject(int id);
@@ -180,7 +188,7 @@ namespace bbtk
 		void saveDiagram(std::string &content);
 
 		//Load the diagram
-		void loadDiagram(ifstream &inputStream);
+		void loadDiagram(std::stringstream &inputStream);
 
 		//Center the view of the camera in the initial position
 		void centerView();
@@ -190,9 +198,26 @@ namespace bbtk
 		std::string findANewNameForABox();
 		//-------
 
+        void SetCbName(std::string cbNane);
+        void SetCbPackageName(std::string packagename);
+        void SetAuthor(std::string author);
+        void SetCategory(std::string category);
+        void SetDescription(std::string description);
+
+        std::string GetCbName();
+        std::string GetCbPackageName();
+        std::string GetAuthor();
+        std::string GetCategory();
+        std::string GetDescription();
 
 	private:
 
+        std::string                         _cbName;
+        std::string                         _cbPackageName;
+        std::string                         _Author;
+        std::string                         _Category;
+        std::string                         _Description;
+
 		//wxPanel that uses the manager
 		wxGEditorTabPanel					*_parent;
 
@@ -231,9 +256,9 @@ namespace bbtk
 
         std::string LineNumber(bool withLineNumber, int &value);
         int GetIndexInSelected(int idControler);
-        bool UnSelectBlackBoxes();
+        void UnSelectBlackBoxes();
         GObjectController *GetGBlackBoxControlerPointedByMouse();
-
+		void CancelConnection();
 
 	protected: