X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsWxGUIEditorGraphic%2FwxGEditorTabPanel.cxx;h=1576f1ecc64a365021db155a760ed48e2d8e09bc;hb=e7cfa1b15189636d8763c56aec0b7a5d6429e4db;hp=cd591b16d36a18a543dc1a82928c583aa0ebd911;hpb=775c8164b5f679027b8bbafa97c0e0110711909b;p=bbtkGEditor.git diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx index cd591b1..1576f1e 100644 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx +++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx @@ -49,13 +49,11 @@ namespace bbtk //========================================================================= wxGEditorTabPanel::wxGEditorTabPanel(wxWindow *parent,int id):wxPanel(parent),wxTextDropTarget() { -printf("EED wxGEditorTabPanel::wxGEditorTabPanel 0\n"); printf ("EED %p wxGEditorTabPanel 2 ()\n" , this ); _id=id; _panelAUIMgr = new wxAuiManager(this); _sceneManager = NULL; initWxVtkCanvas(); -printf("EED wxGEditorTabPanel::wxGEditorTabPanel 1\n"); } //========================================================================= @@ -65,16 +63,12 @@ printf ("EED %p ~wxGEditorTabPanel()\n" , this ); //ED02JUIN2010 _sceneManager->disconnectDrop(); _panelsManager->VerifyLastTabPanel(); - //FCY memory leaks - delete _panelAUIMgr; - delete _sceneManager; } //========================================================================= void wxGEditorTabPanel::initWxVtkCanvas() { -printf("EED wxGEditorTabPanel::initWxVtkCanvas 0\n"); wxVtk3DBaseView *baseview = new wxVtk3DBaseView(this); baseview->Configure(); _sceneManager=new wxVtkSceneManager(this,baseview,_id); @@ -85,7 +79,6 @@ printf("EED wxGEditorTabPanel::initWxVtkCanvas 0\n"); _panelAUIMgr->AddPane((wxWindow*)baseview->GetWxVTKRenderWindowInteractor(),wxAuiPaneInfo().Fixed().CenterPane()); _panelAUIMgr->Update(); -printf("EED wxGEditorTabPanel::initWxVtkCanvas 1\n"); } //========================================================================= @@ -165,25 +158,20 @@ printf("EED wxGEditorTabPanel::initWxVtkCanvas 1\n"); void wxGEditorTabPanel::centerView() { - if(_sceneManager) - { - _sceneManager->centerView(); - } + _sceneManager->centerView(); } //========================================================================= - void wxGEditorTabPanel::saveDiagram(std::string &content, const std::string &path) //DFCH + void wxGEditorTabPanel::saveDiagram(std::string &content) { - this->SetFullPath(path); _sceneManager->saveDiagram(content); } //========================================================================= - void wxGEditorTabPanel::loadDiagram(ifstream &inputStream, const std::string &path) //DFCH + void wxGEditorTabPanel::loadDiagram(ifstream &inputStream) { - this->SetFullPath(path); _sceneManager->loadDiagram(inputStream); } @@ -314,30 +302,10 @@ printf("EED wxGEditorTabPanel::initWxVtkCanvas 1\n"); { _sceneManager->SetDescription( description ); } - //========================================================================= - //DFCH - void wxGEditorTabPanel::SetFullPath( const std::string& fullpath ) - { - this->_fullPath = fullpath; - } - //========================================================================= - //DFCH - void wxGEditorTabPanel::SetFileName( const std::string& filename ) - { - this->_fileName = filename; - } - //========================================================================= - //DFCH - std::string wxGEditorTabPanel::GetFullPath( ) - { - return( this->_fullPath ); - } - //========================================================================= - //DFCH - std::string wxGEditorTabPanel::GetFileName( ) - { - return( this->_fileName ); - } + + + +