X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsWxGUIEditorGraphic%2FbbtkwxGUIEditorGraphicBBS.h;h=7374ac32a5183eb99631cb111d1e1cbfb917d6c1;hb=8a680b0e68359ef1d8dc810d776a4f354ffb65e5;hp=4a62c668e328e8034f8d91224f07bac180ec82e3;hpb=cef73d418644dcb545c7731df11c54146fe82174;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.h b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.h
index 4a62c66..7374ac3 100644
--- 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 "wxBlackBoxEditionDialog.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: