X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkAtomicBlackBox.cxx;h=0c304e081d882cf2224bb207e22fc3058c82cb1a;hb=cfad95b6e08e6e53846ffcda7fbc5932065f2c47;hp=99fe6d25946abc9f219d07f95a6ca5b09227b2f0;hpb=93d88be3faa40557ad9279e2f32b2f9518fa839f;p=bbtk.git

diff --git a/kernel/src/bbtkAtomicBlackBox.cxx b/kernel/src/bbtkAtomicBlackBox.cxx
index 99fe6d2..0c304e0 100644
--- a/kernel/src/bbtkAtomicBlackBox.cxx
+++ b/kernel/src/bbtkAtomicBlackBox.cxx
@@ -1,22 +1,41 @@
+/*
+# ---------------------------------------------------------------------
+#
+# 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/04/21 12:43:05 $
-  Version:   $Revision: 1.5 $
-                                                                                
-  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.
-                                                                                
+  Date:      $Date: 2012/11/16 08:49:01 $
+  Version:   $Revision: 1.14 $
 =========================================================================*/
 
 
+
 /**
  *  \file 
  *  \brief class bbtk::AtomicBlackBox : abstract user defined black boxes
@@ -30,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);
   }
   //========================================================================= 
@@ -46,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);
   }
   //=========================================================================
   
@@ -63,94 +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.
-  IOStatus AtomicBlackBox::bbBackwardUpdate( Connection::Pointer caller )
-  {
-    bbtkDebugMessageInc("Process",1,
-			"=> AtomicBlackBox::bbBackwardUpdate("
-			<<(caller?caller->GetFullName():"0")<<") ["
-			<<bbGetFullName()<<"]"<<std::endl);
-    
-    bbtkDebugMessage("Process",5,"Initial Status  = "<<bbGetStatus()
-                    <<std::endl);
-    bbtkDebugMessage("Process",5,"BoxProcessMode  = "
-                    <<bbGetInputBoxProcessMode()<<std::endl);
-   
-
-    if ( ( bbGetStatus() == MODIFIED ) ||
-        ( bbBoxProcessModeIsAlways() ) )
-      {
-        bool wasExecuting = bbGlobalGetSomeBoxExecuting();
-        bbGlobalSetSomeBoxExecuting(true);
-
-        // Updates its inputs
-        IOStatus s = bbUpdateInputs();
-    
-        bbtkDebugMessage("Process",6,"Inputs post-update status = "<<s<<std::endl);
-        // If all inputs are in UPTODATE post-update status 
-        // and mProcessMode is not "Always"
-        // then the box is now UPTODATE
-        if ( ( s == UPTODATE ) && 
-            ( ! bbBoxProcessModeIsAlways() ) ) 
-            {
-                bbSetStatus(UPTODATE);
-            }
-        else 
-            {
-                // else it remains MODIFIED
-                bbSetStatus(MODIFIED);
-            }
-
-        // User process
-        bbProcess();
-
-        // Displays the window (WxBlackbox)
-        bbShowWindow(caller);
-
-        bbGlobalSetSomeBoxExecuting(wasExecuting);
-
-      }
-    else 
-      {
-        bbtkDebugMessage("Process",5,"Up-to-date : nothing to do"<<std::endl);
-      }
-
-    bbtkDebugMessage("Process",5,"Final Status    = "
-            <<bbGetStatus()<<std::endl);
-    bbtkDebugMessage("Process",1,
-            "<= AtomicBlackBox::bbBackwardUpdate() ["
-            <<bbGetFullName()<<"]"<<std::endl);
-    bbtkDebugDecTab("Process",1);
-
-
-    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()
@@ -193,39 +133,34 @@ namespace bbtk
   
   //=========================================================================
   ///  Sets the data of the input called <name>
-  void AtomicBlackBox::bbSetInput(
-                const std::string &name,
-                Data data, 
-                bool setModified )
+  void AtomicBlackBox::bbSetInput(const std::string &name,
+				  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);
     
     if (setModified) 
-        {
-            bbSetModifiedStatus();
-        }
+      {
+	bbSetStatusAndPropagate(bbGetInputConnectorMap().find(name)->second,
+				MODIFIED);
+      }
     
-    bbtkDebugDecTab("Data",7);
   }
   //=========================================================================
   
-    //=========================================================================
+  //=========================================================================
   ///  Sets the data of the input called <name>
-  void AtomicBlackBox::bbBruteForceSetInputPointer
-    (
-                    const std::string &name, 
-                    void* data, 
-                    bool setModified
-    )
+  void AtomicBlackBox::bbBruteForceSetInputPointer(const std::string &name, 
+						   void* data, 
+						   bool setModified
+						   )
   {
-    bbtkDebugMessageInc("Data",7,
+    bbtkBlackBoxDebugMessage("data",7,
             "AtomicBlackBox::bbBruteForceSetInputPointer(\""
-            <<name<<"\",data) ["
-            <<bbGetFullName()<<"]"
+            <<name<<"\",data)"
             <<std::endl);  
     ((AtomicBlackBoxInputDescriptor*)bbGetDescriptor()
         ->GetInputDescriptor(name))->GetSetFunctor()
@@ -233,10 +168,10 @@ namespace bbtk
     
     if (setModified) 
       {
-        bbSetModifiedStatus();
+	bbSetStatusAndPropagate(bbGetInputConnectorMap().find(name)->second,
+				MODIFIED);
       }
     
-    bbtkDebugDecTab("Data",7);
   }
   //=========================================================================