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

diff --git a/packages/itk/src/bbitkImageReader.h b/packages/itk/src/bbitkImageReader.h
index 5c3491b..3d9e490 100644
--- a/packages/itk/src/bbitkImageReader.h
+++ b/packages/itk/src/bbitkImageReader.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbitkImageReader.h,v $
   Language:  C++
-  Date:      $Date: 2008/02/05 12:11:51 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2008/06/26 09:09:47 $
+  Version:   $Revision: 1.6 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -28,19 +28,21 @@
 #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_INPUT(In,std::string);
     BBTK_DECLARE_OUTPUT(Out,anyImagePointer);
     BBTK_PROCESS(Read);
     void Read();
@@ -49,18 +51,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_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);
   //=================================================================