*** empty log message ***

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

diff --git a/kernel/src/bbtkAtomicBlackBoxOutputDescriptor.h b/kernel/src/bbtkAtomicBlackBoxOutputDescriptor.h
index 56db3bef83a1fa5703e561cf05a1994b2bfbeea3..45a63d1352602d6af5966b6db093159563f445f0 100644 (file)
--- a/kernel/src/bbtkAtomicBlackBoxOutputDescriptor.h
+++ b/kernel/src/bbtkAtomicBlackBoxOutputDescriptor.h
@@ -1,21 +1,34 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbtkAtomicBlackBoxOutputDescriptor.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: 2008/10/17 08:18:12 $
+  Version:   $Revision: 1.3 $
 =========================================================================*/
 
+/* ---------------------------------------------------------------------
+
+* 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::AtomicBlackBoxOutputDescriptor : structure containing the description of a AtomicBlackBox output (name, description, type, functor)
@@ -42,11 +55,12 @@ namespace bbtk
   public:
       
     AtomicBlackBoxOutputDescriptor( 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);
     ~AtomicBlackBoxOutputDescriptor();
     
     /// Returns the type of the input
@@ -65,7 +79,7 @@ namespace bbtk
   private:
     /// Default ctor is private 
     AtomicBlackBoxOutputDescriptor() : 
-      BlackBoxOutputDescriptor(typeid(void),"","") {}
+      BlackBoxOutputDescriptor(typeid(void),"","","") {}
     /// The functor on the Get method
     AtomicBlackBoxGetFunctor* mGetFunctor;
     /// The functor on the Set method