X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsWxGUIEditorGraphic%2FwxVtkSceneManager.h;h=f92b9064e057a733e11e12eaaedbeb68624881e3;hb=de7c0454ab8fc1b0b97dcd7112dfdb4a55ac0215;hp=fe5889c831a0ec357c4f3a2694a05dba54ee992e;hpb=f4dd416d1d3a91b9d684f55a14d78c6b54f2725a;p=bbtkGEditor.git diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.h b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.h index fe5889c..f92b906 100644 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.h +++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.h @@ -116,21 +116,20 @@ namespace bbtk 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, int posinBox,GBoxModel *blackBox); + 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); 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); - int configGConnetion( std::string nameStartBox, std::string nameStartPort, std::string - nameEndBox, std::string nameEndPort); + 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); vtkRenderWindow* getRenderWindow(); - vtkRenderer* getRenderer(); + vtkRenderer* getRenderer(); virtual void update(int idController,int command); @@ -177,7 +176,7 @@ namespace bbtk std::string saveComplexBoxBBS(); //Delete the object in the list of controllers with the id given by parameter. - void deleteObject(int id); + bool deleteObject(int id); void AddControlerToBeRemove(std::vector *controllersToRemove, int id); @@ -209,7 +208,18 @@ namespace bbtk std::string GetAuthor(); std::string GetCategory(); std::string GetDescription(); - + + // 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 ); + + + private: std::string _cbName;