std::string vs wxString

[bbtkGEditor.git] / lib / EditorGraphicBBS / bbsWxGUIEditorGraphic / bbtkwxGUIEditorGraphicBBS.h

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.h b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.h
index 4a62c668e328e8034f8d91224f07bac180ec82e3..5f3a91fbfc25238b9d4644a5868ed861bd4e2a05 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.h
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.h
@@ -45,7 +45,11 @@
 
 //Includes same project
 #include "wxTabPanelsManager.h"
-#include "wxart_new.xpm"
+#include "wxPropertiesPanel.h"
+#include "wxEditionDialog.h"
+#include "wxVtkSceneManager.h"
+//#include "C:\RaC\CREATIS\bbtkGEditor\data\icons\wxart_new.xpm" // JPR
+#include "wxart_new.xpm" // JPR
 
 //Includes creaMaracasVisu
 
@@ -66,11 +70,17 @@
 #include <wx/bitmap.h>
 #include <wx/menu.h>
 #include <wx/dnd.h>
+#include <wx/grid.h>
 
 //Includes std
+#include <iostream>
+#include <fstream>
 
 namespace bbtk
 {
+       class wxTabPanelsManager;
+
+       class wxVtkSceneManager;
   
        class  wxGUIEditorGraphicBBS : public wxFrame
   {
@@ -83,6 +93,15 @@ 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 editBlackBox(GBlackBoxModel *bbmodel);
+               void editDiagramParameters(wxVtkSceneManager* scene);
 
                void RegenerateAll();
                void DoRegeneratePackageDoc(const std::string& pack);   
@@ -98,9 +117,14 @@ namespace bbtk
                wxAuiNotebook                                           *_notebook;
                WxGUIPackageBrowser2                            *_pkgBrowser;
                WxGUIHtmlBrowser                                        *_helpHtmlBrowser;
+               wxPropertiesPanel                                       *_propertiesPanel;
 
                std::string _dataDir;
 
+               std::string _actualPkgBrowserBoxName;
+
+               std::string _actualPkgBrowserPkgName;
+
        protected: