X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsWxGUIEditorGraphic%2FwxVtkSceneManager.h;h=c5cb8cbf591157234be8279bbd8e3e8c3614883e;hb=511369e67cf26244fc8768a727a03f42ff42865f;hp=000b62e2e10d03e97d7f2e53642626d5187cbadd;hpb=d108e756e1f5444e19b63ec457033b7518ba060e;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.h b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.h
index 000b62e..c5cb8cb 100644
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.h
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.h
@@ -144,8 +144,13 @@ namespace bbtk
 		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);
@@ -229,15 +234,14 @@ 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);
-
+		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 GetMessageKind();
         std::string GetMessageLevel();
   
         // RaC2012 2nd HackFest
@@ -245,15 +249,10 @@ namespace bbtk
         // 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;
@@ -261,58 +260,39 @@ namespace bbtk
         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;
 		vtkDataSetMapper					*_aPolygonMapper;
-
 		Factory::Pointer					_bbtkfactory;
-		
-		
         std::string LineNumber(bool withLineNumber, int &value);
         int GetIndexInSelected(int idControler);
         void UnSelectBlackBoxes();
         GObjectController *GetGBlackBoxControlerPointedByMouse();
 		void CancelConnection();
-		
-
 	protected:
-
 	};