X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkAtomicBlackBox.cxx;h=a947d006315da4263a2f615af8fa5691327f93c8;hb=4234999264604da013c2574feef3816c75b3034e;hp=1dba6df361e943a0857a2fdaa979883317692e59;hpb=174ea6d71477e40679f4fd71952e3f2a03416098;p=bbtk.git diff --git a/kernel/src/bbtkAtomicBlackBox.cxx b/kernel/src/bbtkAtomicBlackBox.cxx index 1dba6df..a947d00 100644 --- a/kernel/src/bbtkAtomicBlackBox.cxx +++ b/kernel/src/bbtkAtomicBlackBox.cxx @@ -1,21 +1,33 @@ -/*========================================================================= - +/*========================================================================= Program: bbtk Module: $RCSfile: bbtkAtomicBlackBox.cxx,v $ Language: C++ - Date: $Date: 2008/04/24 10:11:27 $ - Version: $Revision: 1.6 $ - - Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de - l'Image). All rights reserved. See Doc/License.txt or - http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details. - - This software is distributed WITHOUT ANY WARRANTY; without even - the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - PURPOSE. See the above copyright notices for more information. - + Date: $Date: 2008/10/17 08:18:12 $ + Version: $Revision: 1.8 $ =========================================================================*/ +/* --------------------------------------------------------------------- + +* 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 @@ -90,7 +102,10 @@ namespace bbtk if ( ( bbGetStatus() == MODIFIED ) || ( bbBoxProcessModeIsAlways() ) ) { - bool wasExecuting = bbGlobalGetSomeBoxExecuting(); + + bbSetStatus(UPDATING); + + bool wasExecuting = bbGlobalGetSomeBoxExecuting(); bbGlobalSetSomeBoxExecuting(true); // Updates its inputs @@ -100,16 +115,18 @@ namespace bbtk // 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() ) ) { - bbSetStatus(UPTODATE); + new_status = UPTODATE; } else { // else it remains MODIFIED - bbSetStatus(MODIFIED); + new_status = MODIFIED; } + bbSetStatus(new_status); // User process bbProcess();