X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fitk%2Fsrc%2FbbitkImageProperties.h;h=25053b23d6d1d7604c2b5dc99d989552e53c2399;hb=e64f1a51510b44580500fd9ec30b4c937255bf75;hp=7eae227dec7d5873e2b66ed17b4dd2ab3bfbeecb;hpb=e2ad87948c64dcacd5566b9931d969efbe2b031b;p=bbtk.git

diff --git a/packages/itk/src/bbitkImageProperties.h b/packages/itk/src/bbitkImageProperties.h
index 7eae227..25053b2 100644
--- a/packages/itk/src/bbitkImageProperties.h
+++ b/packages/itk/src/bbitkImageProperties.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbitkImageProperties.h,v $
   Language:  C++
-  Date:      $Date: 2008/02/05 12:11:51 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2008/04/18 12:59:50 $
+  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,18 +28,20 @@
 #ifndef __bbtkITKImageProperties_h__
 #define __bbtkITKImageProperties_h__
 
-#include "bbtkUserBlackBox.h"
+#include "bbtkAtomicBlackBox.h"
 #include "bbitkImage.h"
 #include "bbitkImageRegion.h"
 
 namespace bbitk
 {
 
-  class ImageProperties : public bbtk::UserBlackBox  
+  //=================================================================
+  // BlackBox declaration
+  class ImageProperties : public bbtk::AtomicBlackBox  
   {
     
-    BBTK_USER_BLACK_BOX_INTERFACE(ImageProperties,
-				  bbtk::UserBlackBox);
+    BBTK_BLACK_BOX_INTERFACE(ImageProperties,
+			     bbtk::AtomicBlackBox);
 
     BBTK_DECLARE_INPUT(In,anyImagePointer);
     BBTK_DECLARE_OUTPUT(TypeName,std::string);
@@ -55,22 +57,23 @@ namespace bbitk
     // Template doit method 
     template<class ImageType> void DoIt();
   };
+  //=================================================================
   
 
   //=================================================================
-  // UserBlackBox description
-  BBTK_BEGIN_DESCRIBE_BLACK_BOX(ImageProperties,bbtk::UserBlackBox);
+  // BlackBox description
+  BBTK_BEGIN_DESCRIBE_BLACK_BOX(ImageProperties,bbtk::AtomicBlackBox);
   BBTK_NAME("ImageProperties");
   BBTK_AUTHOR("laurent.guigues at creatis.insa-lyon.fr");
-  BBTK_CATEGORY("image")
+  BBTK_CATEGORY("image");
   BBTK_DESCRIPTION("Outputs different properties of an image (type, dimension, size, spacing, ...)");
-  BBTK_INPUT(ImageProperties,In,"Input image",anyImagePointer);
-  BBTK_OUTPUT(ImageProperties,TypeName,"Pixel type name",std::string);
-  BBTK_OUTPUT(ImageProperties,Dimension,"Dimension",unsigned int);
-  BBTK_OUTPUT(ImageProperties,LargestPossibleRegion,"Global extent of the image",anyImageRegion);
-  BBTK_OUTPUT(ImageProperties,Index,"Origin of the image",std::vector<int>);
-  BBTK_OUTPUT(ImageProperties,Size,"Size in each dimension",std::vector<int>);
-  BBTK_OUTPUT(ImageProperties,Spacing,"Size of the voxels",std::vector<float>);
+  BBTK_INPUT(ImageProperties,In,"Input image",anyImagePointer,"");
+  BBTK_OUTPUT(ImageProperties,TypeName,"Pixel type name",std::string,"pixel type");
+  BBTK_OUTPUT(ImageProperties,Dimension,"Dimension",unsigned int,"image dimension");
+  BBTK_OUTPUT(ImageProperties,LargestPossibleRegion,"Global extent of the image",anyImageRegion,"");
+  BBTK_OUTPUT(ImageProperties,Index,"Origin of the image",std::vector<int>,"image index");
+  BBTK_OUTPUT(ImageProperties,Size,"Size in each dimension",std::vector<int>,"image size");
+  BBTK_OUTPUT(ImageProperties,Spacing,"Size of the voxels",std::vector<float>,"voxel size");
   BBTK_END_DESCRIBE_BLACK_BOX(ImageProperties);
   //=================================================================