BUG 1546 Temporary Picker Sync

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

diff --git a/kernel/src/bbtkBlackBox.cxx b/kernel/src/bbtkBlackBox.cxx
index dfdf6e5df63861b3c353e71d6e289b6e20ffdedd..a249bfc79f9193fadebce4d7d02e4aa71054c0bc 100644 (file)
--- 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: 2011/07/22 17:42:50 $
-  Version:   $Revision: 1.54 $
+  Date:      $Date: 2012/07/26 08:28:31 $
+  Version:   $Revision: 1.55 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -109,6 +109,7 @@ namespace bbtk
     bbmExecuting(false),
     bbmName(name),
     bbmBoxProcessMode("Pipeline"),
+       bbLetRecursiveExecuteManualMode(false),
     bbmParent()
     
   {
@@ -135,6 +136,7 @@ namespace bbtk
     bbmExecuting(false),
     bbmName(name), 
     bbmBoxProcessMode(from.bbmBoxProcessMode),
+       bbLetRecursiveExecuteManualMode(false),
     bbmParent()
     
   {
@@ -378,13 +380,19 @@ namespace bbtk
         (p == "F") || (p == "f") ||
         (p == "Flash") || (p == "flash") ) return Flash;
     */
-    bbtkError(bbGetFullName()<<" : BoxProcessMode value '"<<p
+
+         if ( (p == "3") ||
+          (p == "M") || (p == "m") ||
+          (p == "Manual") || (p == "manual") ) return bbManual;
+         
+         bbtkError(bbGetFullName()<<" : BoxProcessMode value '"<<p
              <<"' unknown. Possible values : "
              <<"'0'/'P'/'p'/'Pipeline'/'pipeline' | "
              <<"'1'/'A'/'a'/'Always'/'always' | "
              <<"'2'/'R'/'r'/'Reactive'/'reactive'"
              //      <<"'3'/'F'/'f'/'Flash'/'flash'"
-             <<std::endl);
+             <<"'3'/'M'/'m'/'Manual'/'manual'"
+                 <<std::endl);
   }
   //=========================================================================
   
@@ -403,7 +411,13 @@ namespace bbtk
   //=========================================================================
 
 
-
+       //=========================================================================
+       bool  BlackBox::bbBoxProcessModeIsManual() const
+       {
+               return (bbGetBoxProcessModeValue() == bbManual);
+       }
+       //=========================================================================
+       
 
   //=========================================================================
   void BlackBox::bbAddOutputObserver(const std::string& output, 
@@ -619,9 +633,22 @@ namespace bbtk
     // If force is true then update is triggered even if the box is UPTODATE
     //    if (force) bbSetModifiedStatus();
 
+       if ( bbBoxProcessModeIsManual() ) 
+       {
+               bbLetRecursiveExecuteManualMode = true;
+    }
+         
+         
     // Calls the main recursive execution method 
     bbRecursiveExecute(Connection::Pointer());
 
+         
+       if ( bbBoxProcessModeIsManual() ) 
+       {
+               bbLetRecursiveExecuteManualMode = false;
+       }
+         
+         
     bbtkBlackBoxDebugMessage("process",2,
                             "<= BlackBox::bbExecute()"
                             <<std::endl);
@@ -682,20 +709,40 @@ namespace bbtk
     this->bbCreateWindow();
     
     // Updates its inputs
-    IOStatus s = bbUpdateInputs();
-    
-    if ( (s != UPTODATE) ||
-        bbBoxProcessModeIsAlways() )
+         
+//       IOStatus s;
+         IOStatus s=UPTODATE;
+//       IOStatus s=OUTOFDATE;
+//       IOStatus s=MODIFIED;
+         
+         
+         if ( ( bbBoxProcessModeIsManual()==false )  || 
+                  ( (bbBoxProcessModeIsManual()==true) && (bbLetRecursiveExecuteManualMode==true) ) )
+         {
+                 s = bbUpdateInputs();
+         }       
+                 
+    if ( (s != UPTODATE) ||  bbBoxProcessModeIsAlways() )
       {
          // Displays the window (WxBlackbox)
          //    bbShowWindow(caller);
 
          // Actual processing (virtual)
-         this->bbProcess();
-       
-       
-         // Update the I/O statuses
-         bbComputePostProcessStatus();
+                 if ( ( bbBoxProcessModeIsManual()==false )  || 
+                          ( (bbBoxProcessModeIsManual()==true)&&(bbLetRecursiveExecuteManualMode==true) ) 
+                        )
+                       {
+                               this->bbProcess();              
+                   } // Manual analysis
+                 
+//EED ups                      if ((bbBoxProcessModeIsManual()==true) && (bbLetRecursiveExecuteManualMode==false))
+//EED ups                      {
+//EED ups                        bbSignalOutputModification(true);
+//EED ups                      }
+                 
+                 
+                 // Update the I/O statuses
+                 bbComputePostProcessStatus();
       }
     else 
       {
@@ -809,7 +856,19 @@ namespace bbtk
     for ( o = bbGetOutputConnectorMap().begin(); 
          o!= bbGetOutputConnectorMap().end(); ++o) 
       {
-       o->second->SetStatus(new_output_status);
+               
+//EED            if  ( ( bbBoxProcessModeIsManual()==false )  || 
+//EED                      ( (bbBoxProcessModeIsManual()==true) && (bbLetRecursiveExecuteManualMode==true) ) 
+//EED                    )
+//EED            {
+                         o->second->SetStatus(new_output_status);
+//EED            }  else  {
+//EED                    if  (( (bbBoxProcessModeIsManual()==true) && (bbLetRecursiveExecuteManualMode==false) )  ) 
+//EED                    {
+//EED                            o->second->SetStatus(UPTODATE);
+//EED                    }
+//EED            } // Manual analysis
+                         
       }
 
     bbtkBlackBoxDebugMessage("process",4,