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

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.h b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.h
index d0044ff..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 "C:\RaC\CREATIS\bbtkGEditor\data\icons\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
 
@@ -76,6 +78,8 @@
 namespace bbtk
 {
 	class wxTabPanelsManager;
+
+	class wxVtkSceneManager;
   
 	class  wxGUIEditorGraphicBBS : public wxFrame
   {
@@ -88,13 +92,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);	
 		void DoRegenerateBoxesLists();
@@ -109,7 +115,6 @@ namespace bbtk
 		wxAuiNotebook						*_notebook;
 		WxGUIPackageBrowser2				*_pkgBrowser;
 		WxGUIHtmlBrowser					*_helpHtmlBrowser;
-		wxPropertiesPanel					*_propertiesPanel;
 
 		std::string _dataDir;