*** empty log message ***

[bbtk.git] / kernel / src / bbtkAtomicBlackBox.cxx

diff --git a/kernel/src/bbtkAtomicBlackBox.cxx b/kernel/src/bbtkAtomicBlackBox.cxx
index ae0869d31b64694259efc79f36c475e9321b2e91..b826efcc7e31676d93e57184a35c8f6e3e64aebf 100644 (file)
--- a/kernel/src/bbtkAtomicBlackBox.cxx
+++ b/kernel/src/bbtkAtomicBlackBox.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkAtomicBlackBox.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/04/18 12:59:14 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2008/06/27 08:12:46 $
+  Version:   $Revision: 1.7 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -76,57 +76,45 @@ namespace bbtk
   /// Main processing method of the box.
   IOStatus AtomicBlackBox::bbBackwardUpdate( Connection::Pointer caller )
   {
-    bbtkDebugMessageInc("Process",1,
+    bbtkDebugMessageInc("process",3,
                        "=> AtomicBlackBox::bbBackwardUpdate("
                        <<(caller?caller->GetFullName():"0")<<") ["
                        <<bbGetFullName()<<"]"<<std::endl);
     
-    if (bbGetExecuting()) 
-      {
-       bbtkWarning(bbGetFullName()<<" : Cyclic execution stopped");
-       return UPTODATE;
-      }
-    bbSetExecuting(true);
-
-    bbtkDebugMessage("Process",5,"Initial Status  = "<<bbGetStatus()
+    bbtkDebugMessage("process",5,"Initial Status  = "<<bbGetStatus()
                     <<std::endl);
-    bbtkDebugMessage("Process",5,"BoxProcessMode  = "
+    bbtkDebugMessage("process",5,"BoxProcessMode  = "
                     <<bbGetInputBoxProcessMode()<<std::endl);
    
-    /* 
-    if ( bbGetStatus() == UPDATING ) 
-      {
-    bbtkMessage("Warning",1,"!! WARNING !! Cyclic pipeline execution (bbBackwardUpdate ["<<bbGetFullName()<<"] reentered). This may indicate an error in pipeline conception"<<std::endl);
-    // return UPTODATE;
-    bbSetStatus(MODIFIED);
-      }
-    */
 
     if ( ( bbGetStatus() == MODIFIED ) ||
         ( bbBoxProcessModeIsAlways() ) )
       {
-        bool wasExecuting = bbGlobalGetSomeBoxExecuting();
-        bbGlobalSetSomeBoxExecuting(true);
 
-        //     bbSetStatus(UPDATING);
+       bbSetStatus(UPDATING);
+       
+       bool wasExecuting = bbGlobalGetSomeBoxExecuting();
+        bbGlobalSetSomeBoxExecuting(true);
 
         // Updates its inputs
         IOStatus s = bbUpdateInputs();
     
-        bbtkDebugMessage("Process",6,"Inputs post-update status = "<<s<<std::endl);
+        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
+       IOStatus new_status;
         if ( ( s == UPTODATE ) && 
             ( ! bbBoxProcessModeIsAlways() ) ) 
             {
-                bbSetStatus(UPTODATE);
+                new_status = UPTODATE;
             }
         else 
             {
                 // else it remains MODIFIED
-                bbSetStatus(MODIFIED);
+                 new_status = MODIFIED;
             }
+       bbSetStatus(new_status);
 
         // User process
         bbProcess();
@@ -139,17 +127,15 @@ namespace bbtk
       }
     else 
       {
-        bbtkDebugMessage("Process",5,"Up-to-date : nothing to do"<<std::endl);
+        bbtkDebugMessage("process",5,"Up-to-date : nothing to do"<<std::endl);
       }
 
-    bbtkDebugMessage("Process",5,"Final Status    = "
+    bbtkDebugMessage("process",5,"Final Status    = "
             <<bbGetStatus()<<std::endl);
-    bbtkDebugMessage("Process",1,
+    bbtkDebugMessage("process",3,
             "<= AtomicBlackBox::bbBackwardUpdate() ["
             <<bbGetFullName()<<"]"<<std::endl);
-    bbtkDebugDecTab("Process",1);
 
-    bbSetExecuting(false);
 
     return bbGetStatus();