X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkAtomicBlackBox.cxx;h=b826efcc7e31676d93e57184a35c8f6e3e64aebf;hb=1ae35ab233d889137ae2e0a347f55b960ab4b855;hp=981b16c14d1dd8be1558312d14def889b4e6e7b5;hpb=6c5d7746e8e4cb0b5d6e164b917008a7137910fb;p=bbtk.git

diff --git a/kernel/src/bbtkAtomicBlackBox.cxx b/kernel/src/bbtkAtomicBlackBox.cxx
index 981b16c..b826efc 100644
--- 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/08 06:59:29 $
-  Version:   $Revision: 1.3 $
+  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
@@ -30,10 +30,12 @@ namespace bbtk
   AtomicBlackBox::AtomicBlackBox(const std::string &name, bool alloc)
     : BlackBox(name)
   {
-    bbtkDebugMessageInc("Kernel",7,
-            "AtomicBlackBox::AtomicBlackBox(\""
-            <<name<<"\")"<<std::endl);
-    bbtkDebugDecTab("Kernel",7);
+    bbtkDebugMessage("object",3,
+		     "==> AtomicBlackBox::AtomicBlackBox(\""
+		     <<name<<"\")"<<std::endl);
+    bbtkDebugMessage("object",3,
+		     "<== AtomicBlackBox::AtomicBlackBox(\""
+		     <<name<<"\")"<<std::endl);
   }
   //========================================================================= 
   
@@ -44,11 +46,14 @@ namespace bbtk
                 bool alloc)
     : BlackBox(from,name)
   {
-    bbtkDebugMessageInc("Kernel",7,
-        "AtomicBlackBox::AtomicBlackBox("
-        <<from.bbGetFullName()<<",\""
-        <<name<<"\")"<<std::endl);
-    bbtkDebugDecTab("Kernel",7);
+    bbtkDebugMessage("object",3,
+		     "==>AtomicBlackBox::AtomicBlackBox("
+		     <<from.bbGetFullName()<<",\""
+		     <<name<<"\")"<<std::endl);
+    bbtkDebugMessage("object",3,
+		     "<==AtomicBlackBox::AtomicBlackBox("
+		     <<from.bbGetFullName()<<",\""
+		     <<name<<"\")"<<std::endl);
     
   }
   //=========================================================================
@@ -58,68 +63,58 @@ namespace bbtk
   ///  Destructor
   AtomicBlackBox::~AtomicBlackBox()
   {
-    bbtkDebugMessage("Kernel",7,"AtomicBlackBox::~AtomicBlackBox()"
-            <<std::endl);
+    bbtkDebugMessage("object",3,"==> AtomicBlackBox::~AtomicBlackBox()"
+		     <<std::endl);
+    bbtkDebugMessage("object",3,"<== AtomicBlackBox::~AtomicBlackBox()"
+		     <<std::endl);
   } 
   //=========================================================================
   
-  
+
 
   //=========================================================================
   /// Main processing method of the box.
-  IOStatus AtomicBlackBox::bbBackwardUpdate( Connection* caller )
+  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();
@@ -132,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();
 
@@ -250,6 +243,32 @@ namespace bbtk
     bbtkDebugDecTab("Data",7);
   }
   //=========================================================================
+ 
+
+
+  //==========================================================================
+  std::string AtomicBlackBox::GetObjectInfo() const 
+  {
+    std::stringstream i;
+    return i.str();
+  }
+  //==========================================================================
+
+  //==========================================================================
+  size_t AtomicBlackBox::GetObjectSize() const 
+  {
+    return sizeof(*this);
+  }
+  //==========================================================================
   
+  //==========================================================================
+  size_t AtomicBlackBox::GetObjectRecursiveSize() const 
+  {
+    size_t s = GetObjectSize();
+    return s;
+  }
+  //==========================================================================
+
+ 
 }
 // EO namespace bbtk