X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkComplexBlackBox.cxx;h=47b983717e5b27d0b34b0c68470ca041fb499862;hb=cc134f89048428aca99fa855a7e1e87c815a3413;hp=c06e715270299414e754be1022d8947c1075cc8b;hpb=4a50c01b24b6c1b4eb10ff0f7a56f9e60752ad01;p=bbtk.git

diff --git a/kernel/src/bbtkComplexBlackBox.cxx b/kernel/src/bbtkComplexBlackBox.cxx
index c06e715..47b9837 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:24:58 $
-Version:   $Revision: 1.18 $
-                                                                                
-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/12/12 12:11:21 $
+  Version:   $Revision: 1.24 $
 =========================================================================*/
 
+/* ---------------------------------------------------------------------
+
+* 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"
@@ -82,7 +95,7 @@ namespace bbtk
 
     // We have to make the shared_ptr on this because it is used 
     // in bbUnsafeAddBlackBox !
-    MakePointer(this,true);
+    MakeBlackBoxPointer(this,true);
 
     BlackBoxMapType::const_iterator i;
     for ( i = from.mBlackBoxMap.begin(); i != from.mBlackBoxMap.end(); ++i ) 
@@ -128,6 +141,24 @@ namespace bbtk
     bbtkDebugMessage("object",3,
 		     "==> ComplexBlackBox::~ComplexBlackBox() ["
 		     <<bbGetName()<<"]"<<std::endl);
+    
+    Clear();
+    this->bbDesallocateConnectors();
+
+    bbtkDebugMessage("object",3,
+		     "<== ComplexBlackBox::~ComplexBlackBox() ["
+		     <<bbGetName()<<"]"<<std::endl);
+  } 
+  //=======================================================================
+ 
+
+  //======================================================================= 
+  ///  Clear
+  void ComplexBlackBox::Clear()
+  {
+    bbtkDebugMessage("object",3,
+		     "==> ComplexBlackBox::Clear() ["
+		     <<bbGetName()<<"]"<<std::endl);
 
     bbtkDebugMessage("object",4,
 		     " -> Releasing connections"<<std::endl);
@@ -136,15 +167,11 @@ namespace bbtk
 		     " -> Releasing boxes"<<std::endl);
     mBlackBoxMap.clear();
 
-    //    Clear();
-    this->bbDesallocateConnectors();
-
     bbtkDebugMessage("object",3,
-		     "<== ComplexBlackBox::~ComplexBlackBox() ["
+		     "<== ComplexBlackBox::Clear() ["
 		     <<bbGetName()<<"]"<<std::endl);
   } 
   //=======================================================================
- 
 
   //=========================================================================
   /// Allocates the i/o connectors of the black box
@@ -240,7 +267,7 @@ namespace bbtk
 			<<bbGetFullName()<<"]"<<std::endl);
 
 
-    Wx::BeginBusyCursor();
+    Wx::BusyCursor wait;
     
     if (mExecutionList.size() != 0) 
       {
@@ -263,108 +290,20 @@ namespace bbtk
 	  }
       } 
 
-    Wx::EndBusyCursor();
-    
-    
-  }
-  //==================================================================
-
-  //==================================================================
-  void ComplexBlackBox::bbSetModifiedStatus(BlackBoxInputConnector* c)
-  {
-    bbtkDebugMessage("modified",1,
-			"==> ComplexBlackBox::bbSetModifiedStatus("
-		     <<c<<") ["<<bbGetFullName()<<"]"<<std::endl);
-
-    c->GetBlackBox()->bbSetModifiedStatus(c);
-
-    /*
-    bbtkDebugMessage("modified",1,
-		     "<== ComplexBlackBox::bbSetModifiedStatus("
-		     <<c<<") ["<<bbGetFullName()<<"]"<<std::endl);
-    */
   }
   //==================================================================
 
   //==================================================================
   void ComplexBlackBox::bbAddToExecutionList( const std::string& name )
   {
-        bbtkDebugMessageInc("Kernel",9,
+    bbtkDebugMessageInc("Kernel",9,
 			"ComplexBlackBox::bbAddToExecutionList(\""
 	                <<name<<"\") ["
 			<<bbGetFullName()<<"]"<<std::endl);
-
-	mExecutionList.push_back( name );
-
-     bbtkDebugDecTab("Kernel",9);   
-
-  }
-  //==================================================================
-
-  //==================================================================
-  IOStatus ComplexBlackBox::bbBackwardUpdate(Connection::Pointer caller)
-  {
-    bbtkDebugMessageInc("process",3,
-			"==> ComplexBlackBox::bbBackwardUpdate("
-			<<(caller?caller->GetFullName():"0")<<") ["
-			<<bbGetFullName()<<"]"<<std::endl);
-    //    bbtkInternalError("ComplexBlackBox::bbBackwardUpdate should never be called !");
     
-    if (caller==0)
-      {
-	bbtkInternalError("ComplexBlackBox::bbBackwardUpdate called with caller=0");
-      }
-
-    /*
-    std::cout << "CBB BUP : "<<caller->GetBlackBoxFrom()->bbGetFullName()
-	      <<"."<<caller->GetBlackBoxFromOutput()<<"----"
-	      <<caller->GetOriginalBlackBoxFrom()->bbGetFullName()
-	      <<"."<<caller->GetOriginalBlackBoxFromOutput()<<std::endl;
-    */
-      
-
-
-    IOStatus s = UPTODATE;
-    const BlackBoxDescriptor::OutputDescriptorMapType& omap 
-      = bbGetDescriptor()->GetOutputDescriptorMap(); 
-    BlackBoxDescriptor::OutputDescriptorMapType::const_iterator i 
-      = omap.find(caller->GetBlackBoxFromOutput());
-    if (i!=omap.end())
-      {	
-	// Cast the BBOutputDescriptor into a ComplexBBOutputDescriptor
-	ComplexBlackBoxOutputDescriptor* d = 
-	  (ComplexBlackBoxOutputDescriptor*)i->second;
-	// Get the internal box 
-	BlackBox::Pointer b = bbUnsafeGetBlackBox ( d->GetTarget() );
-	// Calls BackwardUpdate on it
-	bbtkDebugMessageInc("process",4,"Internal box connected to output : "<<d->GetTarget()<<std::endl);
-	// Because internal box can also be a complex box we have to 
-	// temporarily change the connection BlackBoxFromOutput to the 
-	// mapped one
-	
-	//	std::string oldout = caller->GetBlackBoxFromOutput();
-	//	std::cout << "oldout = "<<oldout<<std::endl;
-	//	std::cout << "tmpout = "<<d->GetOutput()<<std::endl;
-	//	caller->SetBlackBoxFromOutput(d->GetOutput());
-	//
-	//Connection newcaller(*caller);
-	//newcaller.SetBlackBoxFromOutput(d->GetOutput());
-	//IOStatus s1 = b->bbBackwardUpdate(&newcaller);
-	IOStatus s1 = b->bbBackwardUpdate(caller);
-	//newcaller.Clear();
-	// restore old output
-	//	caller->SetBlackBoxFromOutput(oldout);
-
-	// ??? STATUS OF CBBs ???
-	// ??? Here it is only the final status of the boxes connected to the output 
-	if (s1==MODIFIED) s=MODIFIED;
-      }
-    else 
-      {
-	bbtkError("Connection '"<<caller->GetFullName()<<"' does not point to a valid output of the complex box !");
-      }
-
-    return s;
+    mExecutionList.push_back( name );
+    
+    bbtkDebugDecTab("Kernel",9);   
     
   }
   //==================================================================