X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsWxGUIEditorGraphic%2FwxVtkSceneManager.h;h=c5cb8cbf591157234be8279bbd8e3e8c3614883e;hb=d209561c0b0ab22fd5b060dc0529c9a316b504d9;hp=ce0c2a70d59994e73cd5e43d92a6dc13a53009cd;hpb=108bfeda96a8850e469fa80add666a5c1dbf1c1f;p=bbtkGEditor.git diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.h b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.h index ce0c2a7..c5cb8cb 100644 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.h +++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.h @@ -1,3 +1,28 @@ +/* +# --------------------------------------------------------------------- +# +# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image +# pour la Santé) +# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton +# +# This software is governed by the CeCILL-B license under French law and +# abiding by the rules of distribution of free software. You can use, +# modify and/ or redistribute the software under the terms of the CeCILL-B +# license as circulated by CEA, CNRS and INRIA at the following URL +# http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html +# or in the file LICENSE.txt. +# +# As a counterpart to the access to the source code and rights to copy, +# modify and redistribute granted by the license, users are provided only +# with a limited warranty and the software's author, the holder of the +# economic rights, and the successive licensors have only limited +# liability. +# +# The fact that you are presently reading this means that you have had +# knowledge of the CeCILL-B license and that you accept its terms. +# ------------------------------------------------------------------------ +*/ + /*========================================================================= Program: bbtk Module: $RCSfile$ @@ -111,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); @@ -164,8 +194,8 @@ namespace bbtk //Add a map of object controllers void addObjects(std::map objectsMap); - /// Duplicates Objects to current a diagram - void DuplicateObjects(std::map objectsMap);///JLGR 21-05-2012 + /// Duplicates Objects to current a diagram + void DuplicateObjects(std::map objectsMap);///JLGR 21-05-2012 //------- // Makes a BlackBox Executable @@ -204,80 +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 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 _controllers; - //Saves the id's of the selected objects in the controllers map std::vector _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: - };