X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsWxGUIEditorGraphic%2FbbtkwxGUIEditorGraphicBBS.h;h=8fe150684d72792a1af798c0a0cbf4954499e88b;hb=624aa5ad040ac84abdb4ab19c52e11019c6180c5;hp=483d2b4fc502bcad9f7c5333d482139aead76fbb;hpb=1b3060e78b445e19d51933556fb072cc90e30c99;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.h b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.h
index 483d2b4..8fe1506 100644
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.h
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.h
@@ -45,8 +45,10 @@
 
 //Includes same project
 #include "wxTabPanelsManager.h"
-#include "wxPropertiesPanel.h"
-#include "wxart_new.xpm"
+#include "wxBlackBoxEditionDialog.h"
+#include "wxVtkSceneManager.h"
+//#include "C:\RaC\CREATIS\bbtkGEditor\data\icons\wxart_new.xpm" // JPR
+#include "wxart_new.xpm" // JPR
 
 //Includes creaMaracasVisu
 
@@ -70,9 +72,14 @@
 #include <wx/grid.h>
 
 //Includes std
+#include <iostream>
+#include <fstream>
 
 namespace bbtk
 {
+	class wxTabPanelsManager;
+
+	class wxVtkSceneManager;
   
 	class  wxGUIEditorGraphicBBS : public wxFrame
   {
@@ -85,7 +92,14 @@ 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);	
@@ -101,10 +115,13 @@ namespace bbtk
 		wxAuiNotebook						*_notebook;
 		WxGUIPackageBrowser2				*_pkgBrowser;
 		WxGUIHtmlBrowser					*_helpHtmlBrowser;
-		wxPropertiesPanel					*_propertiesPanel;
 
 		std::string _dataDir;
 
+		std::string _actualPkgBrowserBoxName;
+
+		std::string _actualPkgBrowserPkgName;
+
 	protected: