X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fsrc%2FbbtkConnection.h;h=2b1fe73d680ac0182199c16703eeb17fc7c1aea6;hb=24e6d3d5d040c30878c7cbaf45db9bf001985713;hp=f1494f01397346cbdda5a6a6c77918efabcbdc86;hpb=4ad5b5ee44357ad873bc8c43230defb6d0a79879;p=bbtk.git diff --git a/kernel/src/bbtkConnection.h b/kernel/src/bbtkConnection.h index f1494f0..2b1fe73 100644 --- a/kernel/src/bbtkConnection.h +++ b/kernel/src/bbtkConnection.h @@ -1,20 +1,33 @@ -/*========================================================================= - +/*========================================================================= Program: bbtk Module: $RCSfile: bbtkConnection.h,v $ Language: C++ - Date: $Date: 2008/04/18 12:59:15 $ - 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/11/13 14:46:43 $ + 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. +* ------------------------------------------------------------------------ */ + /** *\file *\brief Class bbtk::Connection @@ -49,8 +62,8 @@ namespace bbtk const int MODIFIED = 0; /// const int UPTODATE = 1; - /// - const int UPDATING = 2; + /// OBSOLETE + /// const int UPDATING = 2; class BBTK_EXPORT Connection : public Object @@ -62,6 +75,8 @@ namespace bbtk static Pointer New(BlackBoxPointer from, const std::string& output, BlackBoxPointer to, const std::string& input, const FactoryPointer f); + static Pointer New(BlackBoxPointer from, const std::string& output, + BlackBoxPointer to, const std::string& input); /// Dtor // ~Connection(); @@ -156,6 +171,9 @@ namespace bbtk Connection(BlackBoxPointer from, const std::string& output, BlackBoxPointer to, const std::string& input, const FactoryPointer f); + /// Ctor + Connection(BlackBoxPointer from, const std::string& output, + BlackBoxPointer to, const std::string& input); };