X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=itk%2FclitkResampleImageWithOptionsFilter.txx;h=aa09f7129812ce2cc3065e85925d5d09faac173f;hb=bb436e8274c510438ccb5ec1df531675321341bb;hp=dd5a82142edbc0d808a46d5ab713d8d96062e7f8;hpb=1e034c70105f0926939acaaa27ddb46e904ae8bf;p=clitk.git

diff --git a/itk/clitkResampleImageWithOptionsFilter.txx b/itk/clitkResampleImageWithOptionsFilter.txx
index dd5a821..aa09f71 100644
--- a/itk/clitkResampleImageWithOptionsFilter.txx
+++ b/itk/clitkResampleImageWithOptionsFilter.txx
@@ -28,18 +28,16 @@
 #include "itkResampleImageFilter.h"
 #include "itkAffineTransform.h"
 #include "itkNearestNeighborInterpolateImageFunction.h"
+#include "itkWindowedSincInterpolateImageFunction.h"
 #include "itkLinearInterpolateImageFunction.h"
 #include "itkBSplineInterpolateImageFunction.h"
 #include "itkBSplineInterpolateImageFunctionWithLUT.h"
 #include "itkCommand.h"
 
-namespace clitk
-{
-
 //--------------------------------------------------------------------
 template <class TInputImage, class TOutputImage>
-ResampleImageWithOptionsFilter<TInputImage, TOutputImage>::
-ResampleImageWithOptionsFilter():itk::ImageToImageFilter<TInputImage, TOutputImage>()
+clitk::ResampleImageWithOptionsFilter<TInputImage, TOutputImage>::
+ResampleImageWithOptionsFilter():itk::ImageToImageFilter<TInputImage, TOutputImage>() 
 {
   static const unsigned int dim = InputImageType::ImageDimension;
   this->SetNumberOfRequiredInputs(1);
@@ -64,8 +62,8 @@ ResampleImageWithOptionsFilter():itk::ImageToImageFilter<TInputImage, TOutputIma
 //--------------------------------------------------------------------
 template <class TInputImage, class TOutputImage>
 void
-ResampleImageWithOptionsFilter<TInputImage, TOutputImage>::
-SetInput(const InputImageType * image)
+clitk::ResampleImageWithOptionsFilter<TInputImage, TOutputImage>::
+SetInput(const InputImageType * image) 
 {
   // Process object is not const-correct so the const casting is required.
   this->SetNthInput(0, const_cast<InputImageType *>(image));
@@ -76,8 +74,8 @@ SetInput(const InputImageType * image)
 //--------------------------------------------------------------------
 template <class TInputImage, class TOutputImage>
 void
-ResampleImageWithOptionsFilter<TInputImage, TOutputImage>::
-GenerateInputRequestedRegion()
+clitk::ResampleImageWithOptionsFilter<TInputImage, TOutputImage>::
+GenerateInputRequestedRegion() 
 {
   // call the superclass's implementation of this method
   Superclass::GenerateInputRequestedRegion();
@@ -97,8 +95,8 @@ GenerateInputRequestedRegion()
 //--------------------------------------------------------------------
 template <class TInputImage, class TOutputImage>
 void
-ResampleImageWithOptionsFilter<TInputImage, TOutputImage>::
-GenerateOutputInformation()
+clitk::ResampleImageWithOptionsFilter<TInputImage, TOutputImage>::
+GenerateOutputInformation() 
 {
   static const unsigned int dim = InputImageType::ImageDimension;
 
@@ -148,25 +146,27 @@ GenerateOutputInformation()
     m_OutputSize[l] = inputSize[l];
     m_OutputSpacing[l] = inputSpacing[l];
   }
-
+    
   // Set Size/Spacing
   OutputImagePointer outputImage = this->GetOutput(0);
-  OutputImageRegionType region;
-  region.SetSize(m_OutputSize);
-  region.SetIndex(input->GetLargestPossibleRegion().GetIndex());
-  DD(input->GetLargestPossibleRegion().GetIndex());
-  outputImage->SetLargestPossibleRegion(region);
+  // OutputImageRegionType region;
+  m_OutputRegion.SetSize(m_OutputSize);
+  m_OutputRegion.SetIndex(input->GetLargestPossibleRegion().GetIndex());
+  outputImage->CopyInformation(input);
+  outputImage->SetLargestPossibleRegion(m_OutputRegion);
   outputImage->SetSpacing(m_OutputSpacing);
 
   // Init Gaussian sigma
   if (m_GaussianSigma[0] != -1) { // Gaussian filter set by user
     m_GaussianFilteringEnabled = true;
-  } else {
+  }
+  else {
     if (m_GaussianFilteringEnabled) { // Automated sigma when downsample
       for(unsigned int i=0; i<dim; i++) {
         if (m_OutputSpacing[i] > inputSpacing[i]) { // downsample
           m_GaussianSigma[i] = 0.5*m_OutputSpacing[i];// / inputSpacing[i]);
-        } else m_GaussianSigma[i] = 0; // will be ignore after
+        }
+        else m_GaussianSigma[i] = 0; // will be ignore after
       }
     }
   }
@@ -179,22 +179,27 @@ GenerateOutputInformation()
 
 //--------------------------------------------------------------------
 template <class TInputImage, class TOutputImage>
-void
-ResampleImageWithOptionsFilter<TInputImage, TOutputImage>::
-GenerateData()
+void 
+clitk::ResampleImageWithOptionsFilter<TInputImage, TOutputImage>::
+GenerateData() 
 {
-
+   
   // Get input pointer
   InputImagePointer input = dynamic_cast<InputImageType*>(itk::ProcessObject::GetInput(0));
   static const unsigned int dim = InputImageType::ImageDimension;
 
+  // Set regions and allocate
+  //this->GetOutput()->SetRegions(m_OutputRegion);
+  //this->GetOutput()->Allocate();
+  // this->GetOutput()->FillBuffer(m_DefaultPixelValue);
+
   // Create main Resample Image Filter
   typedef itk::ResampleImageFilter<InputImageType,OutputImageType> FilterType;
   typename FilterType::Pointer filter = FilterType::New();
   filter->GraftOutput(this->GetOutput());
-//     this->GetOutput()->Print(std::cout);
-//     this->GetOutput()->SetBufferedRegion(this->GetOutput()->GetLargestPossibleRegion());
-//     this->GetOutput()->Print(std::cout);
+  //     this->GetOutput()->Print(std::cout);
+  //     this->GetOutput()->SetBufferedRegion(this->GetOutput()->GetLargestPossibleRegion());
+  //     this->GetOutput()->Print(std::cout);
 
   // Print options if needed
   if (m_VerboseOptions) {
@@ -205,18 +210,11 @@ GenerateData()
       std::cout << "Sigma          = " << m_GaussianSigma << std::endl;
     std::cout << "Interpol       = ";
     switch (m_InterpolationType) {
-    case NearestNeighbor:
-      std::cout << "NearestNeighbor" << std::endl;
-      break;
-    case Linear:
-      std::cout << "Linear" << std::endl;
-      break;
-    case BSpline:
-      std::cout << "BSpline " << m_BSplineOrder << std::endl;
-      break;
-    case B_LUT:
-      std::cout << "B-LUT " << m_BSplineOrder << " " << m_BLUTSamplingFactor << std::endl;
-      break;
+    case NearestNeighbor: std::cout << "NearestNeighbor" << std::endl; break;
+    case Linear: std::cout << "Linear" << std::endl; break;
+    case BSpline: std::cout << "BSpline " << m_BSplineOrder << std::endl; break;
+    case B_LUT: std::cout << "B-LUT " << m_BSplineOrder << " " << m_BLUTSamplingFactor << std::endl; break;
+    case WSINC: std::cout << "Windowed Sinc" << std::endl; break;
     }
     std::cout << "Threads        = " << this->GetNumberOfThreads() << std::endl;
     std::cout << "LastDimIsTime  = " << m_LastDimensionIsTime << std::endl;
@@ -229,7 +227,8 @@ GenerateData()
   filter->SetOutputSpacing(m_OutputSpacing);
   filter->SetOutputOrigin(input->GetOrigin());
   filter->SetDefaultPixelValue(m_DefaultPixelValue);
-  filter->SetNumberOfThreads(this->GetNumberOfThreads());
+  filter->SetNumberOfThreads(this->GetNumberOfThreads()); 
+  filter->SetOutputDirection(input->GetDirection()); // <-- NEEDED if we want to keep orientation (in case of PermutAxes for example)
 
   // Select interpolator
   switch (m_InterpolationType) {
@@ -260,9 +259,16 @@ GenerateData()
     filter->SetInterpolator(interpolator);
     break;
   }
+  case WSINC: {
+    typedef itk::WindowedSincInterpolateImageFunction<InputImageType, 4> InterpolatorType;
+    typename InterpolatorType::Pointer interpolator =  InterpolatorType::New();
+    filter->SetInterpolator(interpolator);
+    break;
+  }
   }
 
   // Initial Gaussian blurring if needed
+  // TODO : replace by itk::DiscreteGaussianImageFilter for small sigma
   typedef itk::RecursiveGaussianImageFilter<InputImageType, InputImageType> GaussianFilterType;
   std::vector<typename GaussianFilterType::Pointer> gaussianFilters;
   if (m_GaussianFilteringEnabled) {
@@ -290,10 +296,10 @@ GenerateData()
 
   // Set output
   // DD("before Graft");
-  this->GraftOutput(filter->GetOutput());
+
+  //this->GraftOutput(filter->GetOutput());
+  this->SetNthOutput(0, filter->GetOutput());
+
   // DD("after Graft");
 }
 //--------------------------------------------------------------------
-
-}//end clitk
-