X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkComplexBlackBoxOutputDescriptor.cxx;h=840c6fb0ebbedf8dea34ee3e34a8e23b3821de73;hb=4234999264604da013c2574feef3816c75b3034e;hp=7b2d71f0d1d58136ad595c782e0b7d08fa4bf00e;hpb=a26195c366a89795288009cf7e20f11afa494970;p=bbtk.git

diff --git a/kernel/src/bbtkComplexBlackBoxOutputDescriptor.cxx b/kernel/src/bbtkComplexBlackBoxOutputDescriptor.cxx
index 7b2d71f..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/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: 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)
@@ -27,19 +39,22 @@ namespace bbtk
 {
 
 
-  ComplexBlackBoxOutputDescriptor::ComplexBlackBoxOutputDescriptor( const std::string& name,
-								    const std::string& description,
-								    const std::string& target,
-								    const std::string& output,
-								    TypeInfo type)			
+  ComplexBlackBoxOutputDescriptor::
+  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(name,description),
+    BlackBoxOutputDescriptor(creator_type_info,name,description,nature),
     mTarget(target),
     mOutput(output),
     mType(type)
   {    
     
-    bbtkDebugMessage("Core",9,"ComplexBlackBoxOutputDescriptor::ComplexBlackBoxOutputDescriptor(\""<<name<<"\",\""<<description<<"\",\""<<target<<"\",\""<<output<<"\")"<<std::endl);
+    bbtkDebugMessage("Kernel",9,"ComplexBlackBoxOutputDescriptor::ComplexBlackBoxOutputDescriptor(\""<<name<<"\",\""<<description<<"\",\""<<target<<"\",\""<<output<<"\")"<<std::endl);
   }
   
 
@@ -48,7 +63,7 @@ namespace bbtk
 
   ComplexBlackBoxOutputDescriptor::~ComplexBlackBoxOutputDescriptor() 
   {
-    bbtkDebugMessage("Core",9,"ComplexBlackBoxOutputDescriptor::~ComplexBlackBoxOutputDescriptor(\""<<GetName()<<"\",\""<<GetDescription()<<"\",\""<<GetTarget()<<"\",\""<<GetOutput()<<"\")"<<std::endl);
+    bbtkDebugMessage("Kernel",9,"ComplexBlackBoxOutputDescriptor::~ComplexBlackBoxOutputDescriptor(\""<<GetName()<<"\",\""<<GetDescription()<<"\",\""<<GetTarget()<<"\",\""<<GetOutput()<<"\")"<<std::endl);
   }
   
 }