X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkBlackBox.cxx;h=8be7d01d0e3a283d659957fcf63f6284a8dbb7ba;hb=a35973b128a2f7130b619a2a11a35cfd418b21b6;hp=2e5716e3f9ba87e897ae7f3a69d7b10568af3743;hpb=e746553dde41260204aae07b809f484544de10b9;p=bbtk.git

diff --git a/kernel/src/bbtkBlackBox.cxx b/kernel/src/bbtkBlackBox.cxx
index 2e5716e..8be7d01 100644
--- a/kernel/src/bbtkBlackBox.cxx
+++ b/kernel/src/bbtkBlackBox.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkBlackBox.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/12/10 09:33:18 $
-  Version:   $Revision: 1.36 $
+  Date:      $Date: 2009/03/30 14:42:16 $
+  Version:   $Revision: 1.41 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -54,6 +54,7 @@ namespace bbtk
   static std::set<BlackBox::WeakPointer> bbmgExecutionList;
 
   //=========================================================================
+
   BlackBox::Deleter::Deleter()
   {
   }
@@ -78,7 +79,7 @@ namespace bbtk
     
     b->bbDelete();
 
-    bbtkDebugMessage("object",2,"##> BlackBox::Deleter(\""<<name<<"\") : releasing descriptor ["<<desc.lock()<<"]"<<std::endl);
+    bbtkDebugMessage("object",2,"##> BlackBox::Deleter(\""<<name<<"\") : releasing descriptor"<<std::endl);
     
     if (!desc.expired()) 
       {
@@ -153,42 +154,6 @@ namespace bbtk
   //=========================================================================
 
 
-  //=========================================================================
-  /// Main processing method of the box.
-  void BlackBox::bbExecute(bool force)
-  {
-    bbtkDebugMessageInc("process",2,
-			"=> BlackBox::bbExecute("<<(int)force<<") ["
-			<<bbGetFullName()<<"]"<<std::endl);
- 
-    // If already executing : return
-    if (bbGetExecuting()) 
-      {
-	bbtkDebugMessage("process",2,
-			 " -> already executing : bailing out"<<std::endl);
-	return;
-      }
-
-    // If execution frozen : return
-    if (bbGlobalGetFreezeExecution()) 
-      {
-	bbtkDebugMessage("process",2,
-			 " -> FreezeExecution global flag is 'true' : abort execution"<<std::endl);
-      }
-
-    BBTK_BUSY_CURSOR;
-
-    // If force is true then update is triggered even if the box is UPTODATE
-    //    if (force) bbSetModifiedStatus();
-
-    // Calls the main recursive update method 
-    bbBackwardUpdate(Connection::Pointer());
-
-    bbtkDebugMessageDec("process",2,
-			"<= BlackBox::bbExecute() ["
-			<<bbGetFullName()<<"]"<<std::endl);
-  }
-  //=========================================================================
 
   //=========================================================================
   std::string BlackBox::bbGetFullName() const
@@ -382,7 +347,7 @@ namespace bbtk
   bool BlackBox::bbCanReact() const 
   { 
     return ( bbGlobalGetSomeBoxExecuting() 
-#ifdef _USE_WXWIDGETS_
+#ifdef USE_WXWIDGETS
 	     || Wx::IsSomeWindowAlive() 
 #endif
 	     ); 
@@ -418,11 +383,18 @@ namespace bbtk
     if ( (p == "2") ||
 	 (p == "R") || (p == "r") ||
 	 (p == "Reactive") || (p == "reactive") ) return Reactive;
+    /*
+    if ( (p == "3") ||
+	 (p == "F") || (p == "f") ||
+	 (p == "Flash") || (p == "flash") ) return Flash;
+    */
     bbtkError(bbGetFullName()<<" : BoxProcessMode value '"<<p
 	      <<"' unknown. Possible values : "
 	      <<"'0'/'P'/'p'/'Pipeline'/'pipeline' | "
 	      <<"'1'/'A'/'a'/'Always'/'always' | "
-	      <<"'2'/'R'/'r'/'Reactive'/'reactive'"<<std::endl);
+	      <<"'2'/'R'/'r'/'Reactive'/'reactive'"
+	      //      <<"'3'/'F'/'f'/'Flash'/'flash'"
+	      <<std::endl);
   }
   //=========================================================================
   
@@ -581,6 +553,15 @@ namespace bbtk
 
     if (s==UPTODATE) bbtkError("bbSetStatusAndPropagate with status UPTODATE!");
     c->SetStatus(s);
+
+    // Flash reaction
+    /*
+    if (bbGetBoxProcessModeValue() == Flash)
+      {
+	this->bbExecute();
+      }
+    */
+
     OutputConnectorMapType::const_iterator o;	
     for ( o = bbGetOutputConnectorMap().begin(); 
 	  o != bbGetOutputConnectorMap().end(); ++o )			
@@ -723,9 +704,133 @@ namespace bbtk
   }  
   //=========================================================================   
 
+
+
+
+
+
+
+  //=========================================================================
+  /// Main processing method of the box.
+  void BlackBox::bbExecute(bool force)
+  {
+    bbtkDebugMessageInc("process",2,
+			"=> BlackBox::bbExecute("<<(int)force<<") ["
+			<<bbGetFullName()<<"]"<<std::endl);
+ 
+    // If already executing : return
+    /*
+    if (bbGetExecuting()) 
+      {
+	bbtkDebugMessage("process",2,
+			 " -> already executing : abort"<<std::endl);
+	return;
+      }
+    */
+
+    // If execution frozen : return
+    if (bbGlobalGetFreezeExecution()) 
+      {
+	bbtkDebugMessage("process",2,
+			 " -> FreezeExecution global flag is 'true' : abort execution"<<std::endl);
+      }
+
+    BBTK_BUSY_CURSOR;
+
+    // If force is true then update is triggered even if the box is UPTODATE
+    //    if (force) bbSetModifiedStatus();
+
+    // Calls the main recursive execution method 
+    bbRecursiveExecute(Connection::Pointer());
+
+    bbtkDebugMessageDec("process",2,
+			"<= BlackBox::bbExecute() ["
+			<<bbGetFullName()<<"]"<<std::endl);
+  }
+  //=========================================================================
+
+
+  //=========================================================================
+  /// Main recursive processing method of the box.
+  void BlackBox::bbRecursiveExecute( Connection::Pointer caller )
+  {
+    bbtkDebugMessageInc("process",3,
+			"=> BlackBox::bbRecursiveExecute("
+			<<(caller?caller->GetFullName():"0")<<") ["
+			<<bbGetFullName()<<"]"<<std::endl);
+
+    // If already executing : return
+    if (bbGetExecuting()) 
+      {
+	bbtkDebugMessage("process",3,
+			 " -> already executing : abort"<<std::endl);
+	return; 
+      }
+
+    bbSetExecuting(true);
+    bool wasExecuting = bbGlobalGetSomeBoxExecuting();
+    bbGlobalSetSomeBoxExecuting(true);
+
+	this->bbCreateWidget();
+
+    // Updates its inputs
+    IOStatus s = bbUpdateInputs();
+    
+    if ( (s != UPTODATE) ||
+	 bbBoxProcessModeIsAlways() )
+      {
+	  // Displays the window (WxBlackbox)
+ 	  //	bbShowWindow(caller);
+
+	  // Actual processing (virtual)
+	  this->bbProcess();
+	
+	
+	  // Update the I/O statuses
+	  bbComputePostProcessStatus();
+      }
+    else 
+      {
+	// Test output status...
+	OutputConnectorMapType::iterator o;
+	for ( o = bbGetOutputConnectorMap().begin(); 
+	      o!= bbGetOutputConnectorMap().end(); ++o) 
+	  {
+	    if (o->second->GetStatus() != UPTODATE)
+	      {
+		bbtkWarning("BlackBox::bbRecursiveExecute ["
+			    <<bbGetFullName()
+			    <<"] : all inputs are Up-to-date but output '"
+			    <<o->first<<"' is Out-of-date ???");
+	      }
+	  }
+	
+        bbtkDebugMessage("process",3," -> Up-to-date : nothing to do"
+			 <<std::endl);
+      }
+
+	  this->bbShowWidget(); 
+
+	  
+    bbtkDebugMessage("process",3,
+            "<= BlackBox::bbRecursiveExecute() ["
+            <<bbGetFullName()<<"]"<<std::endl);
+
+    bbSetExecuting(false);
+    bbGlobalSetSomeBoxExecuting(wasExecuting);
+
+    return; 
+
+  }
+  //=========================================================================
+  
+   
+
+
+
   //=========================================================================
   /// Updates the BlackBox inputs
-  /// Calls BackwardUpdate on all BlackBoxInputConnector
+  /// Calls RecursiveExecute on all BlackBoxInputConnector
   /// \returns The maximum of final IOStatus after each input update
   IOStatus BlackBox::bbUpdateInputs()
   {
@@ -751,7 +856,7 @@ namespace bbtk
 			    <<" status before update = '"
 			    <<GetIOStatusString(i->second->GetStatus())
 			    <<"'"<<std::endl);
-	i->second->BackwardUpdate();
+	i->second->RecursiveExecute();
 	IOStatus t = i->second->GetStatus();
 	if (t > s) s = t;
 	bbtkDebugMessageDec("change",2,