X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsWxGUIEditorGraphic%2FwxGEditorTabPanel.cxx;h=00f669bc64f9c19a0c96d42d89934c5f7dea8a71;hb=0209f53d6a0dbefceb3610b8d074e8fc4dcaba33;hp=b37e67d4b6b35cf0c13f3d04dd7c9b1d8485008e;hpb=9877bb1bc1cbfc8b4ac0dbd45d443ba670c9d8d2;p=bbtkGEditor.git diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx index b37e67d..00f669b 100644 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx +++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx @@ -47,15 +47,17 @@ namespace bbtk } //========================================================================= - wxGEditorTabPanel::wxGEditorTabPanel(wxWindow *parent,int id):wxPanel(parent),wxTextDropTarget() + wxGEditorTabPanel::wxGEditorTabPanel(wxWindow *parent,int id, Factory::Pointer bbtkfactory) + : wxPanel(parent),wxTextDropTarget() { printf("EED wxGEditorTabPanel::wxGEditorTabPanel 0\n"); printf ("EED %p wxGEditorTabPanel 2 ()\n" , this ); _id=id; - _panelAUIMgr = new wxAuiManager(this); - _sceneManager = NULL; - _actualdo = states.begin(); - _sactualdo = sstates.begin(); + _panelAUIMgr = new wxAuiManager(this); + _sceneManager = NULL; + _actualdo = states.begin(); + _sactualdo = sstates.begin(); + _bbtkfactory = bbtkfactory; initWxVtkCanvas(); printf("EED wxGEditorTabPanel::wxGEditorTabPanel 1\n"); } @@ -72,7 +74,6 @@ printf ("EED %p ~wxGEditorTabPanel() START \n" , this ); delete _sceneManager; printf ("EED %p ~wxGEditorTabPanel() END\n" , this ); - } //========================================================================= @@ -81,7 +82,8 @@ printf ("EED %p ~wxGEditorTabPanel() START \n" , this ); printf("EED wxGEditorTabPanel::initWxVtkCanvas 0\n"); wxVtk3DBaseView *baseview = new wxVtk3DBaseView(this); baseview->Configure(); - _sceneManager=new wxVtkSceneManager(this,baseview,_id); +//EED 15 oct 2012 _sceneManager=new wxVtkSceneManager(this,baseview,_id); + _sceneManager=new wxVtkSceneManager(this,baseview,_id, _bbtkfactory); //EED02JUIN2010 @@ -195,7 +197,7 @@ printf("EED wxGEditorTabPanel::initWxVtkCanvas 1\n"); std::string content = ""; // writing file header content += "# ----------------------------------\n"; - content += "# - BBTKGEditor v 1.2 BBG BlackBox Diagram file\n"; + content += "# - BBTKGEditor v 1.3 BBG BlackBox Diagram file\n"; content += "# - "; content += "temp"; content += "\n";