X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsWxGUIEditorGraphic%2FwxGEditorTabPanel.cxx;h=1576f1ecc64a365021db155a760ed48e2d8e09bc;hb=d80f7d5db196e72294b6fb40cfe2738b5218675b;hp=25eccdf1136519911d20d2be65c6aa2b9859ac0a;hpb=20d8646f40b23f856e8514f4201f4a371d15abd9;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx
index 25eccdf..1576f1e 100644
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx
@@ -1,4 +1,4 @@
-/*=========================================================================                                                                               
+/*=========================================================================
 Program:   bbtk
 Module:    $RCSfile$
 Language:  C++
@@ -11,26 +11,26 @@ Version:   $Revision$
 * Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
 * Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
 *
-*  This software is governed by the CeCILL-B license under French law and 
-*  abiding by the rules of distribution of free software. You can  use, 
-*  modify and/ or redistribute the software under the terms of the CeCILL-B 
-*  license as circulated by CEA, CNRS and INRIA at the following URL 
-*  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+*  This software is governed by the CeCILL-B license under French law and
+*  abiding by the rules of distribution of free software. You can  use,
+*  modify and/ or redistribute the software under the terms of the CeCILL-B
+*  license as circulated by CEA, CNRS and INRIA at the following URL
+*  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
 *  or in the file LICENSE.txt.
 *
 *  As a counterpart to the access to the source code and  rights to copy,
 *  modify and redistribute granted by the license, users are provided only
 *  with a limited warranty  and the software's author,  the holder of the
 *  economic rights,  and the successive licensors  have only  limited
-*  liability. 
+*  liability.
 *
 *  The fact that you are presently reading this means that you have had
 *  knowledge of the CeCILL-B license and that you accept its terms.
-* ------------------------------------------------------------------------ */                                                                         
+* ------------------------------------------------------------------------ */
 
 /**
-*  \file 
-*  \brief Class bbtk::wxGEditorTabPanel . 
+*  \file
+*  \brief Class bbtk::wxGEditorTabPanel .
 */
 
 
@@ -61,8 +61,11 @@ namespace bbtk
 	{
 printf ("EED %p ~wxGEditorTabPanel()\n" , this );
 //ED02JUIN2010		_sceneManager->disconnectDrop();
+
+        _panelsManager->VerifyLastTabPanel();
+
 	}
-	
+
 	//=========================================================================
 	void wxGEditorTabPanel::initWxVtkCanvas()
 	{
@@ -70,9 +73,10 @@ printf ("EED %p ~wxGEditorTabPanel()\n" , this );
 		baseview->Configure();
 		_sceneManager=new wxVtkSceneManager(this,baseview,_id);
 
+
+//EED02JUIN2010
 		printf("RaC-EED 21-06-2010 wxGEditorTabPanel::initWxVtkCanvas Remove the panelAUIMgr, and change to a normal sizer inside the wxGEditorTabPanel\n");
 		_panelAUIMgr->AddPane((wxWindow*)baseview->GetWxVTKRenderWindowInteractor(),wxAuiPaneInfo().Fixed().CenterPane());
-//EED02JUIN2010
 
 		_panelAUIMgr->Update();
 	}
@@ -82,7 +86,7 @@ printf ("EED %p ~wxGEditorTabPanel()\n" , this );
 	bool wxGEditorTabPanel::OnDropText(wxCoord x, wxCoord y, const wxString& data)
 	{
 		std::string packageName="";
-		std::string boxName="";
+		std::string boxType="";
 
 		wxString foo( (data) );
 		char str[150];
@@ -92,11 +96,11 @@ printf ("EED %p ~wxGEditorTabPanel()\n" , this );
 		 char *result = NULL;
 		 result = strtok( str, delims );
 		 packageName += result;
-		 
+
 		 result = strtok( NULL, delims );
-		 boxName += result;
-		 
-		_sceneManager->createGBlackBox(x,y,packageName, boxName);
+		 boxType += result;
+
+		_sceneManager->createGBlackBox(x,y,packageName, boxType);
 
 	  return true;
 	}
@@ -124,16 +128,16 @@ printf ("EED %p ~wxGEditorTabPanel()\n" , this );
 
 	//=========================================================================
 
-	std::string wxGEditorTabPanel::getDiagramBBS()
+	std::string wxGEditorTabPanel::getDiagramBBS(bool wln)
 	{
-		return _sceneManager->getDiagramBBS();
+		return _sceneManager->getDiagramBBS(wln);
 	}
 
 	//=========================================================================
 
-	std::string wxGEditorTabPanel::saveComplexBoxBBS(std::string cbName,std::string cbAuthor,std::string cbCategory,std::string cbDescription)
+	std::string wxGEditorTabPanel::saveComplexBoxBBS()
 	{
-		return _sceneManager->saveComplexBoxBBS(cbName,cbAuthor,cbCategory,cbDescription);
+		return _sceneManager->saveComplexBoxBBS();
 	}
 
 	//=========================================================================
@@ -143,13 +147,6 @@ printf ("EED %p ~wxGEditorTabPanel()\n" , this );
 		_panelsManager->editBlackBox(bbmodel);
 	}
 
-	//=========================================================================
-	
-	void wxGEditorTabPanel::editDiagramParameters(wxVtkSceneManager* scene)
-	{
-		_panelsManager->editDiagramParameters(scene);
-	}
-
 	//=========================================================================
 
 	void wxGEditorTabPanel::deleteAllBoxes()
@@ -165,7 +162,7 @@ printf ("EED %p ~wxGEditorTabPanel()\n" , this );
 	}
 
 	//=========================================================================
-	
+
 	void wxGEditorTabPanel::saveDiagram(std::string &content)
 	{
 		_sceneManager->saveDiagram(content);
@@ -214,7 +211,7 @@ printf ("EED %p ~wxGEditorTabPanel()\n" , this );
 	}
 
 	//=========================================================================
-	
+
 	std::map<int,GObjectController*> wxGEditorTabPanel::getSelectedObjects()
 	{
 		return _sceneManager->getSelectedObjects();
@@ -227,14 +224,91 @@ printf ("EED %p ~wxGEditorTabPanel()\n" , this );
 		_sceneManager->addObjects(objectsMap);
 	}
 
-	//=========================================================================	
-	
+	//=========================================================================
+
 	int wxGEditorTabPanel::getNumSelectedObjects()
 	{
 		return _sceneManager->getNumSelectedObjects();
 	}
 
-	//=========================================================================	
+	//=========================================================================
+
+
+	wxVtkSceneManager* wxGEditorTabPanel::getSceneManager()
+	{
+		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 );
+    }
+
+
+
+
+
+
+
 
 }  // EO namespace bbtk