X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fitk%2Fsrc%2FbbitkImageProperties.h;h=8f20835356c61f5be23ea89786fe7eaedc3c62a2;hb=6575a389b71b1b85c79e4444885becb76ecf16e4;hp=9a7c0079b3a394b167408fa360d9b949d904b356;hpb=710f6dab49cd834ae4d29bc5b0f73b3f481d477f;p=bbtk.git

diff --git a/packages/itk/src/bbitkImageProperties.h b/packages/itk/src/bbitkImageProperties.h
index 9a7c007..8f20835 100644
--- a/packages/itk/src/bbitkImageProperties.h
+++ b/packages/itk/src/bbitkImageProperties.h
@@ -1,20 +1,33 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbitkImageProperties.h,v $
   Language:  C++
-  Date:      $Date: 2008/02/05 13:48:00 $
-  Version:   $Revision: 1.3 $
-                                                                                
-  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:21 $
+  Version:   $Revision: 1.8 $
+=========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* 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 ITKImageProperties : generic ITKImage reader
@@ -28,18 +41,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 +70,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_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);
   //=================================================================