X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fitk%2Fsrc%2FbbitkImageReader.h;h=fa25357a747db42c510ade8b80e40ce7060b4494;hb=c24bcd6f879ecc6ff437ac25d288a6f682c47206;hp=5c3491b8dda56fcc4bac169f5aa3e747e4e1a1e7;hpb=e2ad87948c64dcacd5566b9931d969efbe2b031b;p=bbtk.git

diff --git a/packages/itk/src/bbitkImageReader.h b/packages/itk/src/bbitkImageReader.h
index 5c3491b..fa25357 100644
--- a/packages/itk/src/bbitkImageReader.h
+++ b/packages/itk/src/bbitkImageReader.h
@@ -1,20 +1,33 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbitkImageReader.h,v $
   Language:  C++
-  Date:      $Date: 2008/02/05 12:11:51 $
-  Version:   $Revision: 1.2 $
-                                                                                
-  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: 2010/04/08 14:37:58 $
+  Version:   $Revision: 1.9 $
+=========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* 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 ITKImageReader : generic ITKImage reader
@@ -28,20 +41,22 @@
 #ifndef __bbitkImageReader_h_INCLUDED__
 #define __bbitkImageReader_h_INCLUDED__
 
-#include "bbtkUserBlackBox.h"
+#include "bbtkAtomicBlackBox.h"
 #include "bbitkImage.h"
 
 namespace bbitk
 {
 
-  class ImageReader : public bbtk::UserBlackBox  
+  //=================================================================
+  // BlackBox declaration
+  class ImageReader : public bbtk::AtomicBlackBox  
   {
     
-    BBTK_USER_BLACK_BOX_INTERFACE(ImageReader,
-				  bbtk::UserBlackBox);
+    BBTK_BLACK_BOX_INTERFACE(ImageReader,
+			     bbtk::AtomicBlackBox);
 
-    BBTK_DECLARE_INPUT(Filename,std::string);
-    BBTK_DECLARE_OUTPUT(Out,anyImagePointer);
+    BBTK_DECLARE_INPUT(In,std::string);
+    BBTK_DECLARE_OUTPUT(Out, anyImagePointer);
     BBTK_PROCESS(Read);
     void Read();
 
@@ -49,18 +64,18 @@ namespace bbitk
     // Template read method 
     template<class itkImageType> void Read();
   };
-  
+  //=================================================================  
 
   //=================================================================
-  // UserBlackBox description
-  BBTK_BEGIN_DESCRIBE_BLACK_BOX(ImageReader,bbtk::UserBlackBox);
+  // BlackBox description
+  BBTK_BEGIN_DESCRIBE_BLACK_BOX(ImageReader,bbtk::AtomicBlackBox);
   BBTK_NAME("ImageReader");
   BBTK_AUTHOR("laurent.guigues at creatis.insa-lyon.fr");
-  BBTK_CATEGORY("image;read/write");
+  BBTK_CATEGORY("image; read/write");
   BBTK_DESCRIPTION("Generic itk image reader");
-  BBTK_INPUT(ImageReader,Filename,
-	     "filename with complete path",std::string);
-  BBTK_OUTPUT(ImageReader,Out,"Output image",anyImagePointer);
+  BBTK_INPUT(ImageReader, In,
+	     "filename with complete path", std::string,"file name");
+  BBTK_OUTPUT(ImageReader, Out, "Output image" ,anyImagePointer,"");
   BBTK_END_DESCRIBE_BLACK_BOX(ImageReader);
   //=================================================================