Feature #1774

[bbtk.git] / kernel / src / bbtkComplexBlackBoxInputDescriptor.h

diff --git a/kernel/src/bbtkComplexBlackBoxInputDescriptor.h b/kernel/src/bbtkComplexBlackBoxInputDescriptor.h
index 1cd39a154aedaed9992bcd553c029b6d33972963..0f85f9f1d9fbb22c02030819da914eb27f3070a0 100644 (file)
--- a/kernel/src/bbtkComplexBlackBoxInputDescriptor.h
+++ b/kernel/src/bbtkComplexBlackBoxInputDescriptor.h
@@ -1,21 +1,39 @@
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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: bbtkComplexBlackBoxInputDescriptor.h,v $
   Language:  C++
-  Date:      $Date: 2008/01/22 15:02:00 $
-  Version:   $Revision: 1.1 $
-                                                                                
-  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: 2012/11/16 08:49:01 $
+  Version:   $Revision: 1.5 $
 =========================================================================*/
 
+
 /**
  *  \file 
  *  \brief Class bbtk::ComplexBlackBoxInputDescriptor : structure containing the description of a ComplexBlackBox input (name, description, type, mapping)
@@ -35,12 +53,15 @@ namespace bbtk
 {
 
 
-  class BBTK_EXPORT ComplexBlackBoxInputDescriptor : public bbtk::BlackBoxInputDescriptor
+  class BBTK_EXPORT ComplexBlackBoxInputDescriptor : 
+    public bbtk::BlackBoxInputDescriptor
   {
   public:
       
-    ComplexBlackBoxInputDescriptor( const std::string& name,
+    ComplexBlackBoxInputDescriptor( TypeInfo creator_type_info,
+                                   const std::string& name,
                                    const std::string& description,
+                                   const std::string& nature,
                                    const std::string& target,
                                    const std::string& input,
                                    TypeInfo type);
@@ -63,8 +84,9 @@ namespace bbtk
     
   private:
     /// Default ctor is private 
-    ComplexBlackBoxInputDescriptor() : BlackBoxInputDescriptor("",""),
-                                      mType(typeid(void)) {}
+    ComplexBlackBoxInputDescriptor() : 
+      BlackBoxInputDescriptor(typeid(void),"","",""),
+      mType(typeid(void)) {}
     std::string mTarget;
     std::string mInput;
     TypeInfo mType;