X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkBlackBox.cxx;h=e2dae01bcc2cd42401bc53469cb8106bf3c17005;hb=72e1281cc66954975acc2414264239dcf055c15f;hp=dfdf6e5df63861b3c353e71d6e289b6e20ffdedd;hpb=731d9ee262e286a24e3ea2776d8e914950840a2c;p=bbtk.git

diff --git a/kernel/src/bbtkBlackBox.cxx b/kernel/src/bbtkBlackBox.cxx
index dfdf6e5..e2dae01 100644
--- a/kernel/src/bbtkBlackBox.cxx
+++ b/kernel/src/bbtkBlackBox.cxx
@@ -1,32 +1,39 @@
-/*=========================================================================                                                                               
+/*
+ # ---------------------------------------------------------------------
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ #                        pour la SantÈ)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ #  This software is governed by the CeCILL-B license under French law and
+ #  abiding by the rules of distribution of free software. You can  use,
+ #  modify and/ or redistribute the software under the terms of the CeCILL-B
+ #  license as circulated by CEA, CNRS and INRIA at the following URL
+ #  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+ #  or in the file LICENSE.txt.
+ #
+ #  As a counterpart to the access to the source code and  rights to copy,
+ #  modify and redistribute granted by the license, users are provided only
+ #  with a limited warranty  and the software's author,  the holder of the
+ #  economic rights,  and the successive licensors  have only  limited
+ #  liability.
+ #
+ #  The fact that you are presently reading this means that you have had
+ #  knowledge of the CeCILL-B license and that you accept its terms.
+ # ------------------------------------------------------------------------ */
+
+
+/*=========================================================================
   Program:   bbtk
   Module:    $RCSfile: bbtkBlackBox.cxx,v $
   Language:  C++
-  Date:      $Date: 2011/07/22 17:42:50 $
-  Version:   $Revision: 1.54 $
+  Date:      $Date: 2012/11/16 08:49:01 $
+  Version:   $Revision: 1.56 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
-* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
-*
-*  This software is governed by the CeCILL-B license under French law and 
-*  abiding by the rules of distribution of free software. You can  use, 
-*  modify and/ or redistribute the software under the terms of the CeCILL-B 
-*  license as circulated by CEA, CNRS and INRIA at the following URL 
-*  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
-*  or in the file LICENSE.txt.
-*
-*  As a counterpart to the access to the source code and  rights to copy,
-*  modify and redistribute granted by the license, users are provided only
-*  with a limited warranty  and the software's author,  the holder of the
-*  economic rights,  and the successive licensors  have only  limited
-*  liability. 
-*
-*  The fact that you are presently reading this means that you have had
-*  knowledge of the CeCILL-B license and that you accept its terms.
-* ------------------------------------------------------------------------ */                                                                         
+
 
 /**
  *  \file 
@@ -109,6 +116,7 @@ namespace bbtk
     bbmExecuting(false),
     bbmName(name),
     bbmBoxProcessMode("Pipeline"),
+	bbLetRecursiveExecuteManualMode(false),
     bbmParent()
     
   {
@@ -135,6 +143,7 @@ namespace bbtk
     bbmExecuting(false),
     bbmName(name), 
     bbmBoxProcessMode(from.bbmBoxProcessMode),
+	bbLetRecursiveExecuteManualMode(false),
     bbmParent()
     
   {
@@ -378,13 +387,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 +418,13 @@ namespace bbtk
   //=========================================================================
 
 
-
+	//=========================================================================
+	bool  BlackBox::bbBoxProcessModeIsManual() const
+	{
+		return (bbGetBoxProcessModeValue() == bbManual);
+	}
+	//=========================================================================
+	
 
   //=========================================================================
   void BlackBox::bbAddOutputObserver(const std::string& output, 
@@ -619,9 +640,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 +716,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 +863,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,