X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkAtomicBlackBoxOutputDescriptor.cxx;h=39fe8879e6f253158ecc4438fdd3389c27ac4cb5;hb=6ac9074f717f22c4ffdc6a70d0704c1b1f8fe842;hp=db79f8ff2e2323f86457e169ac80093277323603;hpb=6f678e6883d4d2734c81492412903c701c8e1f3c;p=bbtk.git

diff --git a/kernel/src/bbtkAtomicBlackBoxOutputDescriptor.cxx b/kernel/src/bbtkAtomicBlackBoxOutputDescriptor.cxx
index db79f8f..39fe887 100644
--- a/kernel/src/bbtkAtomicBlackBoxOutputDescriptor.cxx
+++ b/kernel/src/bbtkAtomicBlackBoxOutputDescriptor.cxx
@@ -1,21 +1,34 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbtkAtomicBlackBoxOutputDescriptor.cxx,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: 2009/05/28 08:12:05 $
+  Version:   $Revision: 1.4 $
 =========================================================================*/
 
+/* ---------------------------------------------------------------------
+
+* 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)
@@ -29,29 +42,32 @@ namespace bbtk
 
   AtomicBlackBoxOutputDescriptor::
   AtomicBlackBoxOutputDescriptor( TypeInfo creator_type_info,
-				const std::string& name,
-				const std::string& description,
-				AtomicBlackBoxGetFunctor* getfunctor,
-				AtomicBlackBoxSetFunctor* setfunctor,
-				bool copy_construct ) 
+				  const std::string& name,
+				  const std::string& description,
+				  const std::string& nature,
+				  AtomicBlackBoxGetFunctor* getfunctor,
+				  AtomicBlackBoxSetFunctor* setfunctor,
+				  bool copy_construct ) 
     : 
     BlackBoxOutputDescriptor(creator_type_info,
-			     name,description,copy_construct),
+			     name,description,nature,
+			     copy_construct),
     mGetFunctor(getfunctor),
     mSetFunctor(setfunctor)
   {    
     
-    bbtkDebugMessage("Kernel",9,
-		     "AtomicBlackBoxOutputDescriptor::AtomicBlackBoxOutputDescriptor(\""
+    bbtkDebugMessage("kernel",9,
+		     "AtomicBlackBoxOutputDescriptor(\""
 		     <<name<<"\",\""<<description
-		     <<"\""<<getfunctor<<","<<setfunctor
+		     <<"\",\""<<nature<<"\","
+		     <<getfunctor<<","<<setfunctor
 		     <<","<<copy_construct<<")"<<std::endl);
   }
   
 
   AtomicBlackBoxOutputDescriptor::~AtomicBlackBoxOutputDescriptor() 
   {
-    bbtkDebugMessage("Kernel",9,"AtomicBlackBoxOutputDescriptor::~AtomicBlackBoxOutputDescriptor(\""<<GetName()<<"\",\""<<GetDescription()<<"\""<<mGetFunctor<<","<<mSetFunctor<<")"<<std::endl);
+    bbtkDebugMessage("kernel",9,"~AtomicBlackBoxOutputDescriptor(\""<<GetName()<<"\")"<<std::endl);
   }
   
 }