X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsWxGUIEditorGraphic%2FbbtkwxGUIEditorGraphicBBS.h;h=2994c616890919fd9a0b1c5ccb76a3695c9b97cd;hb=ee78ea5e5132aa8e24b525dfa92fd0a355e8245a;hp=d81251db6919c450502b8e2657a54c72b725457c;hpb=d43eaee96a8c31023bae53055512ef35fd4e67c9;p=bbtkGEditor.git diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.h b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.h index d81251d..2994c61 100644 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.h +++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.h @@ -45,10 +45,12 @@ //Includes same project #include "wxTabPanelsManager.h" -#include "wxPropertiesPanel.h" -#include "wxEditionDialog.h" +#include "wxBlackBoxEditionDialog.h" #include "wxVtkSceneManager.h" -#include "C:\RaC\CREATIS\bbtkGEditor\data\icons\wxart_new.xpm" +//#include "C:\RaC\CREATIS\bbtkGEditor\data\icons\wxart_new.xpm" // JPR +#include "wxart_new.xpm" // JPR +#include "wxart_run.xpm" +#include "wxart_delete.xpm" //Includes creaMaracasVisu @@ -92,12 +94,11 @@ namespace bbtk void initTabPanelsManager(); void initPackageBrowser(); void initHelpHTMLBrowser(); - void initPropertiesPanel(); wxAuiNotebook* getAuiNotebook(); void displayBlackBoxInfo(std::string packageName, std::string boxName); void updateStatusBar(std::string textStatus); - void executeActualDiagram(); + void executeScript(std::string script); void editBlackBox(GBlackBoxModel *bbmodel); void editDiagramParameters(wxVtkSceneManager* scene); @@ -106,7 +107,9 @@ namespace bbtk void DoRegeneratePackageDoc(const std::string& pack); void DoRegenerateBoxesLists(); - void OnToolLeftClick(wxCommandEvent& event); + void OnCreateNewTab(wxCommandEvent& event); + void OnExecuteActualDiagram(wxCommandEvent& event); + void OnDeleteAllBoxesActualDiagram(wxCommandEvent& event); void OnExit(wxCommandEvent& event); @@ -116,7 +119,6 @@ namespace bbtk wxAuiNotebook *_notebook; WxGUIPackageBrowser2 *_pkgBrowser; WxGUIHtmlBrowser *_helpHtmlBrowser; - wxPropertiesPanel *_propertiesPanel; std::string _dataDir;