X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkComplexBlackBoxOutputDescriptor.cxx;h=840c6fb0ebbedf8dea34ee3e34a8e23b3821de73;hb=2d2fc4c6349d5040a9f13a240f079e7a1c6687dd;hp=504199a350164513b1daf2f1f1d870c22ea7bcf1;hpb=7eba604321498f7ed6333b7cbe9bf2aceb4ec30e;p=bbtk.git diff --git a/kernel/src/bbtkComplexBlackBoxOutputDescriptor.cxx b/kernel/src/bbtkComplexBlackBoxOutputDescriptor.cxx index 504199a..840c6fb 100644 --- a/kernel/src/bbtkComplexBlackBoxOutputDescriptor.cxx +++ b/kernel/src/bbtkComplexBlackBoxOutputDescriptor.cxx @@ -1,21 +1,33 @@ -/*========================================================================= - +/*========================================================================= Program: bbtk Module: $RCSfile: bbtkComplexBlackBoxOutputDescriptor.cxx,v $ Language: C++ - Date: $Date: 2008/02/06 14:14:22 $ - 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::ComplexBlackBoxOutputDescriptor : structure containing the description of a ComplexBlackBox output (name, description, type, mapping) @@ -31,11 +43,12 @@ namespace bbtk ComplexBlackBoxOutputDescriptor( TypeInfo creator_type_info, const std::string& name, const std::string& description, + const std::string& nature, const std::string& target, const std::string& output, TypeInfo type) : - BlackBoxOutputDescriptor(creator_type_info,name,description), + BlackBoxOutputDescriptor(creator_type_info,name,description,nature), mTarget(target), mOutput(output), mType(type)