X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsWxGUIEditorGraphic%2FwxGEditorTabPanel.cxx;h=4291597df0cc6b00e2caf375424b6f908adfd1c3;hb=a5299437956e8cc3de71aaefede487ae06f4294f;hp=cd591b16d36a18a543dc1a82928c583aa0ebd911;hpb=775c8164b5f679027b8bbafa97c0e0110711909b;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx
index cd591b1..4291597 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");
 	}
 
 	//=========================================================================
@@ -142,9 +135,9 @@ printf("EED wxGEditorTabPanel::initWxVtkCanvas 1\n");
 
 	//=========================================================================
 
-	std::string wxGEditorTabPanel::saveComplexBoxBBS()
+	std::string wxGEditorTabPanel::saveComplexBoxBBS(std::string cbName,std::string cbAuthor,std::string cbCategory,std::string cbDescription)
 	{
-		return _sceneManager->saveComplexBoxBBS();
+		return _sceneManager->saveComplexBoxBBS(cbName,cbAuthor,cbCategory,cbDescription);
 	}
 
 	//=========================================================================
@@ -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);
 	}
 
@@ -251,96 +239,6 @@ printf("EED wxGEditorTabPanel::initWxVtkCanvas 1\n");
 		return _sceneManager;
 	}
 
-	//=========================================================================
-    std::string wxGEditorTabPanel::GetCbName()
-	{
-	    return _sceneManager->GetCbName();
-	}
-
-
-	//=========================================================================
-    std::string wxGEditorTabPanel::GetCbPackageName()
-	{
-	    return _sceneManager->GetCbPackageName();
-	}
-
-	//=========================================================================
-    std::string wxGEditorTabPanel::GetAuthor()
-	{
-	    return _sceneManager->GetAuthor();
-	}
-
-	//=========================================================================
-    std::string wxGEditorTabPanel::GetDescription()
-	{
-	    return _sceneManager->GetDescription();
-	}
-
-	//=========================================================================
-    std::string wxGEditorTabPanel::GetCategory()
-	{
-	    return _sceneManager->GetCategory();
-	}
-
-	//=========================================================================
-    void wxGEditorTabPanel::SetCbName(std::string cbName)
-    {
-        _sceneManager->SetCbName( cbName );
-    }
-
-	//=========================================================================
-    void wxGEditorTabPanel::SetCbPackageName(std::string packagename)
-    {
-        _sceneManager->SetCbPackageName( packagename );
-    }
-
-
-	//=========================================================================
-    void wxGEditorTabPanel::SetAuthor(std::string author)
-    {
-        _sceneManager->SetAuthor( author );
-    }
-
-
-	//=========================================================================
-    void wxGEditorTabPanel::SetCategory(std::string category)
-    {
-        _sceneManager->SetCategory( category );
-    }
-
-
-	//=========================================================================
-    void wxGEditorTabPanel::SetDescription(std::string description)
-    {
-        _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 );
-	}
-
-
-
 
 }  // EO namespace bbtk