X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkAtomicBlackBoxInputDescriptor.h;h=d9067ff0f391c84876111bd9a83522d21e88ae45;hb=cfad95b6e08e6e53846ffcda7fbc5932065f2c47;hp=a44c420c8df708163414f521e2b9153e38752b0f;hpb=6f678e6883d4d2734c81492412903c701c8e1f3c;p=bbtk.git

diff --git a/kernel/src/bbtkAtomicBlackBoxInputDescriptor.h b/kernel/src/bbtkAtomicBlackBoxInputDescriptor.h
index a44c420..d9067ff 100644
--- a/kernel/src/bbtkAtomicBlackBoxInputDescriptor.h
+++ b/kernel/src/bbtkAtomicBlackBoxInputDescriptor.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: bbtkAtomicBlackBoxInputDescriptor.h,v $
   Language:  C++
-  Date:      $Date: 2008/02/07 11:06:37 $
-  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.4 $
 =========================================================================*/
 
+
 /**
  *  \file 
  *  \brief Class bbtk::AtomicBlackBoxInputDescriptor : structure containing the description of a AtomicBlackBox input (name, description, type, functor)
@@ -47,12 +65,13 @@ namespace bbtk
 
       
     AtomicBlackBoxInputDescriptor( TypeInfo creator_type_info,
-				 const std::string& name,
-				 const std::string& description,
-				 AtomicBlackBoxGetFunctor* getfunctor,
-				 AtomicBlackBoxSetFunctor* setfunctor,
-				 bool copy_construct = true);
-
+				   const std::string& name,
+				   const std::string& description,
+				   const std::string& nature,
+				   AtomicBlackBoxGetFunctor* getfunctor,
+				   AtomicBlackBoxSetFunctor* setfunctor,
+				   bool copy_construct = true);
+    
     ~AtomicBlackBoxInputDescriptor();  
     /// Returns the type of the input
     TypeInfo GetTypeInfo() const { return mGetFunctor->GetTypeInfo(); }
@@ -71,7 +90,7 @@ namespace bbtk
   private:
     /// Default ctor is private 
     AtomicBlackBoxInputDescriptor() : 
-      BlackBoxInputDescriptor(typeid(void),"","") {}
+      BlackBoxInputDescriptor(typeid(void),"","","") {}
     /// The functor on the Get method
     AtomicBlackBoxGetFunctor* mGetFunctor;
     /// The functor on the Set method