X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkAtomicBlackBox.cxx;h=0c304e081d882cf2224bb207e22fc3058c82cb1a;hb=16993e9f411c62e9a73d13c40f3748bdd232ce09;hp=d42185163bdf9dd230273a65edeadd0bb414e272;hpb=3928b4ad06b5b5fd142f696f58a7828d064e2883;p=bbtk.git

diff --git a/kernel/src/bbtkAtomicBlackBox.cxx b/kernel/src/bbtkAtomicBlackBox.cxx
index d421851..0c304e0 100644
--- a/kernel/src/bbtkAtomicBlackBox.cxx
+++ b/kernel/src/bbtkAtomicBlackBox.cxx
@@ -1,32 +1,39 @@
-/*=========================================================================                                                                               
+/*
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la SantÈ)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  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: bbtkAtomicBlackBox.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/12/08 12:53:35 $
-  Version:   $Revision: 1.11 $
+  Date:      $Date: 2012/11/16 08:49:01 $
+  Version:   $Revision: 1.14 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* 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.
-* ------------------------------------------------------------------------ */                                                                         
 
 
 /**
@@ -42,11 +49,8 @@ namespace bbtk
   AtomicBlackBox::AtomicBlackBox(const std::string &name, bool alloc)
     : BlackBox(name)
   {
-    bbtkDebugMessage("object",3,
-		     "==> AtomicBlackBox::AtomicBlackBox(\""
-		     <<name<<"\")"<<std::endl);
-    bbtkDebugMessage("object",3,
-		     "<== AtomicBlackBox::AtomicBlackBox(\""
+    bbtkBlackBoxDebugMessage("object",3,
+		     "==> AtomicBlackBox(\""
 		     <<name<<"\")"<<std::endl);
   }
   //========================================================================= 
@@ -58,15 +62,10 @@ namespace bbtk
                 bool alloc)
     : BlackBox(from,name)
   {
-    bbtkDebugMessage("object",3,
-		     "==>AtomicBlackBox::AtomicBlackBox("
-		     <<from.bbGetFullName()<<",\""
-		     <<name<<"\")"<<std::endl);
-    bbtkDebugMessage("object",3,
-		     "<==AtomicBlackBox::AtomicBlackBox("
-		     <<from.bbGetFullName()<<",\""
-		     <<name<<"\")"<<std::endl);
-    
+    bbtkBlackBoxDebugMessage("object",3,
+			     "==> AtomicBlackBox("
+			     <<from.bbGetFullName()<<",\""
+			     <<name<<"\")"<<std::endl);
   }
   //=========================================================================
   
@@ -75,82 +74,26 @@ namespace bbtk
   ///  Destructor
   AtomicBlackBox::~AtomicBlackBox()
   {
-    bbtkDebugMessage("object",3,"==> AtomicBlackBox::~AtomicBlackBox()"
+    bbtkBlackBoxDebugMessage("object",3,"==> ~AtomicBlackBox()"
 		     <<std::endl);
-    bbtkDebugMessage("object",3,"<== AtomicBlackBox::~AtomicBlackBox()"
+    bbtkBlackBoxDebugMessage("object",3,"<== ~AtomicBlackBox()"
 		     <<std::endl);
   } 
   //=========================================================================
   
 
 
-  //=========================================================================
-  /// Main processing method of the box.
-  void AtomicBlackBox::bbBackwardUpdate( Connection::Pointer caller )
-  {
-    bbtkDebugMessageInc("process",3,
-			"=> AtomicBlackBox::bbBackwardUpdate("
-			<<(caller?caller->GetFullName():"0")<<") ["
-			<<bbGetFullName()<<"]"<<std::endl);
-
-    // If already executing : return
-    if (bbGetExecuting()) 
-      {
-	bbtkDebugMessage("process",3,
-			 " -> already executing : returning"<<std::endl);
-	return; 
-      }
-
-    bbSetExecuting(true);
-    bool wasExecuting = bbGlobalGetSomeBoxExecuting();
-    bbGlobalSetSomeBoxExecuting(true);
-
-    // Updates its inputs
-    IOStatus s = bbUpdateInputs();
-    
-    if ( (s != UPTODATE) ||
-	 bbBoxProcessModeIsAlways() )
-      {
-	// User process
-	bbProcess();
-	
-	// Displays the window (WxBlackbox)
-	bbShowWindow(caller);
-	
-	// Update the I/O statuses
-	bbComputePostProcessStatus();
-      }
-    else 
-      {
-        bbtkDebugMessage("process",5," -> Up-to-date : nothing to do"
-			 <<std::endl);
-      }
-
-    bbtkDebugMessage("process",3,
-            "<= AtomicBlackBox::bbBackwardUpdate() ["
-            <<bbGetFullName()<<"]"<<std::endl);
-
-    bbSetExecuting(false);
-    bbGlobalSetSomeBoxExecuting(wasExecuting);
-
-    return; // bbGetStatus();
-
-  }
-  //=========================================================================
   
-    
   //=========================================================================
   Data AtomicBlackBox::bbGetOutput( const std::string &name )
   {
-    bbtkDebugMessageInc("Data",7,
-            "AtomicBlackBox::bbGetOutput(\""<<name<<"\") ["
-            <<bbGetFullName()<<"]"
-            <<std::endl);
+    bbtkBlackBoxDebugMessage("data",7,
+			     "AtomicBlackBox::bbGetOutput(\""<<name<<"\")"
+			     <<std::endl);
     
     Data p = ((AtomicBlackBoxOutputDescriptor*)bbGetDescriptor()
-                ->GetOutputDescriptor(name))->GetGetFunctor()->Get(this);
+	      ->GetOutputDescriptor(name))->GetGetFunctor()->Get(this);
     
-    bbtkDebugDecTab("Data",7);
     return p;
   }
   //=========================================================================
@@ -160,15 +103,13 @@ namespace bbtk
   ///  Gets the input Data of a given name
   Data AtomicBlackBox::bbGetInput( const std::string &name ) 
   {
-    bbtkDebugMessageInc("Data",7,
-            "AtomicBlackBox::bbGetInput(\""<<name<<"\") ["
-            <<bbGetFullName()<<"]"
-            <<std::endl);  
+    bbtkBlackBoxDebugMessage("data",7,
+			     "AtomicBlackBox::bbGetInput(\""<<name<<"\")"
+			     <<std::endl);  
     
     Data p = ((AtomicBlackBoxInputDescriptor*)bbGetDescriptor()
-                ->GetInputDescriptor(name))->GetGetFunctor()->Get(this);
+	      ->GetInputDescriptor(name))->GetGetFunctor()->Get(this);
     
-    bbtkDebugDecTab("Data",7);
     return p;
   }
   //=========================================================================
@@ -178,9 +119,8 @@ namespace bbtk
   ///  Sets the data of the output called <name>
   void AtomicBlackBox::bbSetOutput( const std::string &name, Data data)
   {
-    bbtkDebugMessageInc("Data",7,
-            "AtomicBlackBox::bbSetOutput(\""<<name<<"\",data) ["
-            <<bbGetFullName()<<"]"
+    bbtkBlackBoxDebugMessage("data",7,
+            "AtomicBlackBox::bbSetOutput(\""<<name<<"\",data)"
             <<std::endl); 
     
     ((AtomicBlackBoxOutputDescriptor*)bbGetDescriptor()
@@ -197,9 +137,8 @@ namespace bbtk
 				  Data data, 
 				  bool setModified )
   {
-    bbtkDebugMessageInc("data",7,
-            "AtomicBlackBox::bbSetInput(\""<<name<<"\",data) ["
-            <<bbGetFullName()<<"]"
+    bbtkBlackBoxDebugMessage("data",7,
+            "AtomicBlackBox::bbSetInput(\""<<name<<"\",data)"
             <<std::endl);  
     ((AtomicBlackBoxInputDescriptor*)bbGetDescriptor()->GetInputDescriptor(name))->GetSetFunctor()->Set(this,data);
     
@@ -209,7 +148,6 @@ namespace bbtk
 				MODIFIED);
       }
     
-    bbtkDebugDecTab("data",7);
   }
   //=========================================================================
   
@@ -220,10 +158,9 @@ namespace bbtk
 						   bool setModified
 						   )
   {
-    bbtkDebugMessageInc("data",7,
+    bbtkBlackBoxDebugMessage("data",7,
             "AtomicBlackBox::bbBruteForceSetInputPointer(\""
-            <<name<<"\",data) ["
-            <<bbGetFullName()<<"]"
+            <<name<<"\",data)"
             <<std::endl);  
     ((AtomicBlackBoxInputDescriptor*)bbGetDescriptor()
         ->GetInputDescriptor(name))->GetSetFunctor()
@@ -235,7 +172,6 @@ namespace bbtk
 				MODIFIED);
       }
     
-    bbtkDebugDecTab("data",7);
   }
   //=========================================================================