X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsWxGUIEditorGraphic%2FwxGEditorTabPanel.cxx;h=58e8835daf6f83690c92aeb5fa7694541078b3da;hb=782cadf1306a646406ed7a089907f73a5f12c4e5;hp=00f669bc64f9c19a0c96d42d89934c5f7dea8a71;hpb=9c270766f2c28346e128543a8b7c24fb7f4f5b85;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx
index 00f669b..58e8835 100644
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx
@@ -1,3 +1,28 @@
+/*
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+#                        pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+#
+#  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. 
+#
+#  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.
+# ------------------------------------------------------------------------  
+*/
+
 /*=========================================================================
 Program:   bbtk
 Module:    $RCSfile$
@@ -50,8 +75,6 @@ namespace bbtk
 	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;
@@ -59,27 +82,22 @@ printf("EED wxGEditorTabPanel::wxGEditorTabPanel 0\n");
 		_sactualdo		= sstates.begin();
 		_bbtkfactory	= bbtkfactory;
 		initWxVtkCanvas();
-printf("EED wxGEditorTabPanel::wxGEditorTabPanel 1\n");
 	}
 
 	//=========================================================================
 	wxGEditorTabPanel::~wxGEditorTabPanel()
 	{
-printf ("EED %p ~wxGEditorTabPanel() START \n" , this );
 //ED02JUIN2010		_sceneManager->disconnectDrop();
 
         _panelsManager->VerifyLastTabPanel();
 		//FCY memory leaks
 		delete _panelAUIMgr;
 		delete _sceneManager;
-
-		printf ("EED %p ~wxGEditorTabPanel() END\n" , this );
 	}
 
 	//=========================================================================
 	void wxGEditorTabPanel::initWxVtkCanvas()
 	{
-printf("EED wxGEditorTabPanel::initWxVtkCanvas 0\n");
 		wxVtk3DBaseView *baseview = new wxVtk3DBaseView(this);
 		baseview->Configure();
 //EED 15 oct 2012 		_sceneManager=new wxVtkSceneManager(this,baseview,_id);
@@ -91,7 +109,6 @@ printf("EED wxGEditorTabPanel::initWxVtkCanvas 0\n");
 		_panelAUIMgr->AddPane((wxWindow*)baseview->GetWxVTKRenderWindowInteractor(),wxAuiPaneInfo().Fixed().CenterPane());
 
 		_panelAUIMgr->Update();
-printf("EED wxGEditorTabPanel::initWxVtkCanvas 1\n");
 	}
 
 	//=========================================================================
@@ -113,8 +130,11 @@ printf("EED wxGEditorTabPanel::initWxVtkCanvas 1\n");
 		 result = strtok( NULL, delims );
 		 boxType += result;
 
-		_sceneManager->createGBlackBox(x,y,packageName, boxType);
-		saveTempandUpdate("drop box");
+		if ( _panelsManager->TryToOpenScriptApplication(packageName,boxType) == false )
+		{
+			_sceneManager->createGBlackBox(x,y,packageName, boxType);
+			saveTempandUpdate("drop box");
+		}		
 	  return true;
 	}