X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fstd%2Fsrc%2FbbstdMagicBox.cxx;h=1a66b5cab35cd605d5813b498bd14fd6b0136083;hb=6b2916fb6359ead51e50b3ee9b473dc1c3c057d4;hp=fe601be58f205e9d0c8e289d9af17f3e60265822;hpb=a35973b128a2f7130b619a2a11a35cfd418b21b6;p=bbtk.git

diff --git a/packages/std/src/bbstdMagicBox.cxx b/packages/std/src/bbstdMagicBox.cxx
index fe601be..1a66b5c 100644
--- a/packages/std/src/bbstdMagicBox.cxx
+++ b/packages/std/src/bbstdMagicBox.cxx
@@ -1,34 +1,38 @@
-/*=========================================================================                                                                               
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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: bbstdMagicBox.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/03/30 14:42:23 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2012/11/16 08:51:32 $
+  Version:   $Revision: 1.9 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* 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.
-* ------------------------------------------------------------------------ */                                                                         
-
-
 #include "bbstdMagicBox.h"
 #include "bbstdPackage.h"
 #include "bbtkBlackBoxOutputConnector.h"
@@ -37,29 +41,43 @@ using namespace bbtk;
 namespace bbstd
 {
 
-  void MagicBox::bbSetStatusAndPropagate(bbtk::BlackBoxInputConnector* c,
-					 bbtk::IOStatus s)
+	void MagicBox::bbComputePostProcessStatus()
+	{
+	AtomicBlackBox::bbComputePostProcessStatus();
+
+	if (bbGetInputActive()==false)
+	{
+		// Update the output statuses
+		IOStatus new_output_status = UPTODATE;
+		OutputConnectorMapType::iterator o;
+		for ( o = bbGetOutputConnectorMap().begin(); o!= bbGetOutputConnectorMap().end(); ++o) 
+		{
+			o->second->SetStatus(new_output_status);
+		} // for o
+	} // if
+
+  }
+
+
+  void MagicBox::bbUserSetDefaultValues()
+  {
+	bbSetInputActive(true);
+  }
+
+  void MagicBox::bbUserInitializeProcessing() 
+  { 
+  }
+
+  void  MagicBox::bbUserFinalizeProcessing() 
   {
-    bbtkDebugMessageInc("change",5,
-			"=> MagicBox::bbSetStatusAndPropagate(input,"
-			<<GetIOStatusString(s)<<") ["
-			<<bbGetFullName()<<"]"<<std::endl);
-   if (mCanSet)
-      {
-	if (c->IsConnected())
-	  {
-	    std::string do_input = c->GetConnection()->GetBlackBoxToInput();
-	    c->GetConnection()->TransferData();
-	    bbSetOutputOut( bbGetInput(do_input) ); 	
-	  }
-	mCanSet = false;
-      }
-   BlackBox::bbSetStatusAndPropagate(c,s);
   }
 
   void MagicBox::DoProcess()
   { 
-    mCanSet = true;
+	if (bbGetInputActive()==true)
+	{
+		bbSetOutputOut( bbGetInputIn() );
+	} // Active
   }
 
   BBTK_ADD_BLACK_BOX_TO_PACKAGE(std,MagicBox);