X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fsrc%2FbbtkAtomicBlackBox.cxx;h=bf354ab3e909da3bdeb9d43e37a8a52e2b7029d8;hb=8dd53a72bc1dd1ca2c6e2763c0aeb51c77ee352e;hp=3ee7d62b05d0e98e685e87f7683b04fcbc9c382a;hpb=1e2df7fb6ae571ce1cf72e6af1715f0e34675cbf;p=bbtk.git

diff --git a/kernel/src/bbtkAtomicBlackBox.cxx b/kernel/src/bbtkAtomicBlackBox.cxx
index 3ee7d62..bf354ab 100644
--- a/kernel/src/bbtkAtomicBlackBox.cxx
+++ b/kernel/src/bbtkAtomicBlackBox.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkAtomicBlackBox.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/11/25 11:17:13 $
-  Version:   $Revision: 1.10 $
+  Date:      $Date: 2008/12/11 09:50:34 $
+  Version:   $Revision: 1.12 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -84,90 +84,7 @@ namespace bbtk
   
 
 
-  //=========================================================================
-  /// Main processing method of the box.
-  IOStatus 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 : bailing out"<<std::endl);
-	return bbGetStatus();
-      }
-    bbSetExecuting(true);
-    bool wasExecuting = bbGlobalGetSomeBoxExecuting();
-    bbGlobalSetSomeBoxExecuting(true);
-
-    bbtkDebugMessage("process",5,"Initial Status  = "<<bbGetStatus()
-                    <<std::endl);
-    bbtkDebugMessage("process",5,"BoxProcessMode  = "
-                    <<bbGetInputBoxProcessMode()<<std::endl);
-   
-
-    if ( ( bbGetStatus() == MODIFIED ) ||
-        ( bbBoxProcessModeIsAlways() ) )
-      {
-
-	//	bbSetStatus(UPDATING);
-
-        // Updates its inputs
-        IOStatus s = bbUpdateInputs();
-    
-        bbtkDebugMessage("process",6,"=> AtomicBlackBox::bbBackwardUpdate("
-			<<(caller?caller->GetFullName():"0")<<") ["
-			<<bbGetFullName()<<"] : 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() ) ) 
-            {
-                new_status = UPTODATE;
-            }
-        else 
-            {
-                // else it remains MODIFIED
-                 new_status = MODIFIED;
-            }
-	bbSetStatus(new_status);
-
-        // User process
-        bbProcess();
-
-        // Displays the window (WxBlackbox)
-        bbShowWindow(caller);
-
-
-      }
-    else 
-      {
-        bbtkDebugMessage("process",5,"Up-to-date : nothing to do"<<std::endl);
-      }
-
-    bbtkDebugMessage("process",5,"=> AtomicBlackBox::bbBackwardUpdate("
-		     <<(caller?caller->GetFullName():"0")<<") ["
-		     <<bbGetFullName()<<"] : Final Status    = "
-		     <<bbGetStatus()<<std::endl);
-    bbtkDebugMessage("process",3,
-            "<= AtomicBlackBox::bbBackwardUpdate() ["
-            <<bbGetFullName()<<"]"<<std::endl);
-
-    bbSetExecuting(false);
-    bbGlobalSetSomeBoxExecuting(wasExecuting);
-
-    return bbGetStatus();
-
-  }
-  //=========================================================================
   
-    
   //=========================================================================
   Data AtomicBlackBox::bbGetOutput( const std::string &name )
   {
@@ -222,10 +139,9 @@ 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) ["
@@ -234,22 +150,21 @@ namespace bbtk
     ((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,
             "AtomicBlackBox::bbBruteForceSetInputPointer(\""
@@ -262,7 +177,8 @@ namespace bbtk
     
     if (setModified) 
       {
-        bbSetModifiedStatus();
+	bbSetStatusAndPropagate(bbGetInputConnectorMap().find(name)->second,
+				MODIFIED);
       }
     
     bbtkDebugDecTab("data",7);