X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkAtomicBlackBox.cxx;h=49dbcac191bea0843a08671c5a5cd8b25cf4ef4e;hb=893cff74b10b6e9271e480491ae485ae69f5816e;hp=1b11dcf7b355dd804d5e10dc9b26683aee2226f5;hpb=236a8e2fee9937c050e2d16c7222e1caa993f01c;p=bbtk.git

diff --git a/kernel/src/bbtkAtomicBlackBox.cxx b/kernel/src/bbtkAtomicBlackBox.cxx
index 1b11dcf..49dbcac 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/13 14:46:43 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2009/05/28 08:12:05 $
+  Version:   $Revision: 1.13 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -42,11 +42,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 +55,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,111 +67,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",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 )
   {
-    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;
   }
   //=========================================================================
@@ -189,15 +96,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;
   }
   //=========================================================================
@@ -207,9 +112,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()
@@ -222,39 +126,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()
@@ -262,10 +161,10 @@ namespace bbtk
     
     if (setModified) 
       {
-        bbSetModifiedStatus();
+	bbSetStatusAndPropagate(bbGetInputConnectorMap().find(name)->second,
+				MODIFIED);
       }
     
-    bbtkDebugDecTab("Data",7);
   }
   //=========================================================================