X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fitk%2Fsrc%2FbbitkResampleImageFilter.h;h=0dae92d7b8a9a0ca6e3d4e190f7a849b9eb945d3;hb=13aaa782a7f5942f5072728201750c06afbdfb2d;hp=5d87c97bd2b2f57491dd051f392f1eb76d304e44;hpb=f5db17702a2c51a5933f6c556d070167e4db9cfd;p=bbtk.git

diff --git a/packages/itk/src/bbitkResampleImageFilter.h b/packages/itk/src/bbitkResampleImageFilter.h
index 5d87c97..0dae92d 100644
--- a/packages/itk/src/bbitkResampleImageFilter.h
+++ b/packages/itk/src/bbitkResampleImageFilter.h
@@ -1,3 +1,34 @@
+/*=========================================================================                                                                               
+  Program:   bbtk
+  Module:    $RCSfile: bbitkResampleImageFilter.h,v $
+  Language:  C++
+  Date:      $Date: 2008/11/25 11:17:15 $
+  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.
+* ------------------------------------------------------------------------ */                                                                         
+
+
 #ifdef _USE_ITK_
 
 #include <math.h>
@@ -16,7 +47,7 @@ namespace bbitk
     : 
     public bbtk::AtomicBlackBox
   {
-    BBTK_USER_BLACK_BOX_INTERFACE(ResampleImageFilter,
+    BBTK_BLACK_BOX_INTERFACE(ResampleImageFilter,
 				  bbtk::AtomicBlackBox);
     BBTK_DECLARE_INPUT(In,anyImagePointer);
     BBTK_DECLARE_INPUT(Spacing,std::vector<double>);
@@ -27,7 +58,7 @@ namespace bbitk
     inline void ProcessSwitch();
     template <class T> void Process();
     void bbUserConstructor() { Init(); }
-    void bbUserCopyConstructor() { Init(); }
+    void bbUserCopyConstructor(bbtk::BlackBox::Pointer) { Init(); }
     void Init();
     itk::Object* mOutput;
   };
@@ -39,14 +70,14 @@ namespace bbitk
   BBTK_DESCRIPTION("Resamples an image");
   BBTK_CATEGORY("image;filter");
   BBTK_INPUT(ResampleImageFilter,In,
-	     "Input image. Can be any itk::Image<T,D>*",anyImagePointer);
+	     "Input image. Can be any itk::Image<T,D>*",anyImagePointer,"");
   BBTK_INPUT(ResampleImageFilter,Spacing,
-	     "Spacing",std::vector<double>);
+	     "Spacing",std::vector<double>,"spacing");
   BBTK_INPUT(ResampleImageFilter,Interpolation,
-	     "Interpolation",std::string);
+	     "Interpolation",std::string,"");
   BBTK_OUTPUT(ResampleImageFilter,Out,
 	      "Output image. Of the same type and dimension than the input image",
-	      anyImagePointer);
+	      anyImagePointer,"");
   BBTK_END_DESCRIBE_BLACK_BOX(ResampleImageFilter);
 
 
@@ -81,7 +112,7 @@ namespace bbitk
     LPR = in->GetLargestPossibleRegion();
     size = LPR.GetSize();
     //    origin = LPR.GetIndex(); //in->GetOrigin();
-     for (int i=0;i<Dimension;++i) 
+     for (unsigned int i=0;i<Dimension;++i) 
       {
 	origin[i] = LPR.GetIndex()[i]*in->GetSpacing()[i];
 	spacing[i] = bbGetInputSpacing()[i];
@@ -108,14 +139,8 @@ namespace bbitk
     filter->SetTransform ( transform );
 
     
-    // Interpolation 
-    if  ( bbGetInputInterpolation() == "Linear" ) {
-      typedef itk::LinearInterpolateImageFunction < ImageType, double > InterpolatorType;     
-      // We create an interpolator of the found type 
-      typename InterpolatorType::Pointer interpolator =  InterpolatorType::New();
-      filter->SetInterpolator( interpolator );
-    }
-    else if  ( bbGetInputInterpolation() == "NearestNeighbor" ) {
+ 
+    if  ( bbGetInputInterpolation() == "NearestNeighbor" ) {
       typedef itk::NearestNeighborInterpolateImageFunction < ImageType, double > InterpolatorType;     
       // We create an interpolator of the found type 
       typename InterpolatorType::Pointer interpolator = InterpolatorType::New();
@@ -133,7 +158,13 @@ namespace bbitk
       //	std::cout << "Warning! you're using unsigned data ! The interpolated value may result negative! "<< std::endl;
       // }
     } //end else if
- 
+    // Interpolation 
+    else { // if ( bbGetInputInterpolation() == "Linear" ) {
+      typedef itk::LinearInterpolateImageFunction < ImageType, double > InterpolatorType;     
+      // We create an interpolator of the found type 
+      typename InterpolatorType::Pointer interpolator =  InterpolatorType::New();
+      filter->SetInterpolator( interpolator );
+    }
 
     filter->Update();
     filter->GetOutput()->Register();