X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkComplexBlackBox.cxx;h=a8653ccedbe769f10698b804d512c39291f28b20;hb=4234999264604da013c2574feef3816c75b3034e;hp=3a9c3c0e1e02d376352e79366634aa334234bb67;hpb=174ea6d71477e40679f4fd71952e3f2a03416098;p=bbtk.git

diff --git a/kernel/src/bbtkComplexBlackBox.cxx b/kernel/src/bbtkComplexBlackBox.cxx
index 3a9c3c0..a8653cc 100644
--- a/kernel/src/bbtkComplexBlackBox.cxx
+++ b/kernel/src/bbtkComplexBlackBox.cxx
@@ -1,27 +1,40 @@
-/*=========================================================================
-                                                                                
-Program:   bbtk
-Module:    $RCSfile: bbtkComplexBlackBox.cxx,v $
-Language:  C++
-Date:      $Date: 2008/04/24 10:11:28 $
-Version:   $Revision: 1.17 $
-                                                                                
-Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
-l'Image). All rights reserved. See Doc/License.txt or
-http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details.
-                                                                                
-This software is distributed WITHOUT ANY WARRANTY; without even
-the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-PURPOSE.  See the above copyright notices for more information.
-                                                                               
+/*=========================================================================                                                                               
+  Program:   bbtk
+  Module:    $RCSfile: bbtkComplexBlackBox.cxx,v $
+  Language:  C++
+  Date:      $Date: 2008/10/17 08:18:12 $
+  Version:   $Revision: 1.21 $
 =========================================================================*/
 
+/* ---------------------------------------------------------------------
+
+* 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 
+*  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.
+* ------------------------------------------------------------------------ */                                                                         
+
 
 /**
  *  \file 
  *  \brief class bbtk::ComplexBlackBox : user defined complex black boxes
  */
 #include "bbtkComplexBlackBox.h"
+#include "bbtkWx.h"
 #include "bbtkBlackBoxDescriptor.h"
 #include "bbtkFactory.h"
 #include "bbtkConfigurationFile.h"
@@ -79,13 +92,17 @@ namespace bbtk
 			<<from.bbGetName()<<"\",\""
 			<<name<<"\")"<<std::endl);
     bbtkDebugMessage("object",4,"  * Cloning Black Boxes"<<std::endl);
+
+    // We have to make the shared_ptr on this because it is used 
+    // in bbUnsafeAddBlackBox !
+    MakeBlackBoxPointer(this,true);
+
     BlackBoxMapType::const_iterator i;
     for ( i = from.mBlackBoxMap.begin(); i != from.mBlackBoxMap.end(); ++i ) 
       {
 	bbtkDebugMessageInc("object",5,"    * Cloning \""<<i->first<<"\""<<std::endl);
 	BlackBox::Pointer B = i->second->bbClone(i->second->bbGetName());
 	bbUnsafeAddBlackBox(B);
-	
       }
    
     bbtkDebugMessage("object",4,"  * Cloning Connections"<<std::endl);
@@ -236,7 +253,7 @@ namespace bbtk
 			<<bbGetFullName()<<"]"<<std::endl);
 
 
-    Wx::BeginBusyCursor();
+    Wx::BusyCursor wait;
     
     if (mExecutionList.size() != 0) 
       {
@@ -259,9 +276,6 @@ namespace bbtk
 	  }
       } 
 
-    Wx::EndBusyCursor();
-    
-    
   }
   //==================================================================