X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsWxGUIEditorGraphic%2FwxVtkSceneManager.h;h=c5cb8cbf591157234be8279bbd8e3e8c3614883e;hb=a45d2dc35562aad94f11ce0c82dfe5f53155462e;hp=31c974d1204a41ddb2243580f47ecf9ac23bbaf9;hpb=447f0466f545453283ac5593549ea0ce7224c693;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.h b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.h
index 31c974d..c5cb8cb 100644
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.h
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.h
@@ -136,16 +136,21 @@ 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
+        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 );
 		int createGComplexBoxInputPort(std::string inputName);
 		int createGComplexBoxOutputPort(std::string outputName);
 		GPortController* createGPort(int portType, std::string bbtkName, std::string bbtkType, std::string bbtkDescription, int posinBox,GBoxModel *blackBox);
-		int createGInputPort(int portType, int posinBox,GBoxModel *blackBox, BlackBoxInputDescriptor *desc);
-		int createGOutputPort(int portType, int posinBox,GBoxModel *blackBox, BlackBoxOutputDescriptor *desc);
+
+//EED2017-04-07
+//		int createGInputPort(int portType, int posinBox,GBoxModel *blackBox, BlackBoxInputDescriptor *desc);
+//		int createGOutputPort(int portType, int posinBox,GBoxModel *blackBox, BlackBoxOutputDescriptor *desc);
+		int createGInputPort(int portType, int posinBox,GObjectController *gBoxControler, BlackBoxInputDescriptor *desc);
+		int createGOutputPort(int portType, int posinBox,GObjectController *gBoxControler, BlackBoxOutputDescriptor *desc);
+
 		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);
@@ -189,8 +194,8 @@ 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
+		/// Duplicates Objects to current a diagram
+    	void DuplicateObjects(std::map<int,GObjectController*> objectsMap);///JLGR 21-05-2012
 
 		//-------
 		// Makes a BlackBox Executable
@@ -229,83 +234,65 @@ namespace bbtk
         void SetAuthor(std::string author);
         void SetCategory(std::string category);
         void SetDescription(std::string description);
-
+		void SetMessageKind(std::string kind);
+		void SetMessageLevel(std::string Level);
         std::string GetCbName();
         std::string GetCbPackageName();
         std::string GetAuthor();
         std::string GetCategory();
         std::string GetDescription();
+		std::string GetMessageKind();
+        std::string GetMessageLevel();
   
         // RaC2012 2nd HackFest
         // External Inputs was the complex inputs in previous versions
         // Get names of all external inputs
         std::vector< std::string> GetExternalInputsNames();
 		void getCleanLine(std::stringstream &inputStream, std::string &line);
-		
         // JGRR & CM
         void printAll( int com, int sta );
-
-		
-		
+		std::vector<std::string> boxesDiagram;//CFT
 	private:
-
         std::string                         _cbName;
         std::string                         _cbPackageName;
         std::string                         _Author;
         std::string                         _Category;
         std::string                         _Description;
-
+		std::string            				_MessageKind;
+		std::string            				_MessageLevel;
 		//wxPanel that uses the manager
 		wxGEditorTabPanel					*_parent;
-
 		// Id of the manager, the same of the panel
 		int									_idManager;
-
 		// Boxes number in the scene
 		int									_numBoxes;
-
 		// StartDragging
 		bool								_startDragging;
-
 		// creaMaracasVisu viewer
 		wxVtk3DBaseView						*_baseView;
-
 		// State of the 3D Scene or the virtual world
 		int _worldState;
-
 		//Map of id - objectController
 		std::map<int,GObjectController*>	_controllers;
-
 		//Saves the id's of the selected objects in the controllers map
 		std::vector<int>					_selectedObjects;
-
 		//Is the diagram in state complex box
 		bool								_isComplexBox;
-
 		int									_idConnectionInCreation;
-
 		int _contLastId;
-
 		vtkTextActor3D						*_textActor;
-		std::string						_bugTextActor_text;
-		int							_bugTextActor_status;
-
-		vtkPoints						*_pts;
-		vtkActor						*_fillObjectActor;
+		std::string							_bugTextActor_text;
+		int									_bugTextActor_status;
+		vtkPoints							*_pts;
+		vtkActor							*_fillObjectActor;
 		vtkDataSetMapper					*_aPolygonMapper;
-
 		Factory::Pointer					_bbtkfactory;
-		
-		
         std::string LineNumber(bool withLineNumber, int &value);
         int GetIndexInSelected(int idControler);
         void UnSelectBlackBoxes();
         GObjectController *GetGBlackBoxControlerPointedByMouse();
 		void CancelConnection();
-		
-
 	protected:
-
 	};