X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkBlackBoxInputDescriptor.h;h=095215266c5e4c4d7f6b5745047ccc22109d5b47;hb=1688b52778caa9985ecea38aad38341817e0401a;hp=9481722bf545eaffbb131924b9b4bcbdb92c474a;hpb=981ac411655ee59f6cf7a6e89099a4366ac4b18b;p=bbtk.git diff --git a/kernel/src/bbtkBlackBoxInputDescriptor.h b/kernel/src/bbtkBlackBoxInputDescriptor.h index 9481722..0952152 100644 --- a/kernel/src/bbtkBlackBoxInputDescriptor.h +++ b/kernel/src/bbtkBlackBoxInputDescriptor.h @@ -1,21 +1,34 @@ -/*========================================================================= - +/*========================================================================= Program: bbtk Module: $RCSfile: bbtkBlackBoxInputDescriptor.h,v $ Language: C++ - Date: $Date: 2008/04/04 08:04:05 $ - Version: $Revision: 1.3 $ - - 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.5 $ =========================================================================*/ +/* --------------------------------------------------------------------- + +* 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::BlackBoxInputDescriptor : abstract descriptor of an input of a black box @@ -46,10 +59,13 @@ namespace bbtk BlackBoxInputDescriptor(TypeInfo creator_type_info, const std::string& name, const std::string& description, - OptionType option = MANDATORY, - bool copy_construct = true) + const std::string& nature, + bool copy_construct = true, + OptionType option = MANDATORY + ) : BlackBoxInputOutputDescriptor(creator_type_info,name, - description,copy_construct), + description,nature, + copy_construct), mOption(option) {} /// Returns the option of the input