X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=registration%2FclitkConvertBLUTCoeffsToVFFilter.txx;h=da20e6b9879e310a37a4072467de76a77d551e78;hb=HEAD;hp=ef63900717289f73c0fc3b71969c8a7a0c44ec6c;hpb=c234e07e4ef90bb8b08c75ca4f1b3a76055e7859;p=clitk.git

diff --git a/registration/clitkConvertBLUTCoeffsToVFFilter.txx b/registration/clitkConvertBLUTCoeffsToVFFilter.txx
index ef63900..da20e6b 100644
--- a/registration/clitkConvertBLUTCoeffsToVFFilter.txx
+++ b/registration/clitkConvertBLUTCoeffsToVFFilter.txx
@@ -107,7 +107,7 @@ namespace clitk
 
       // Mask
       typedef itk::ImageMaskSpatialObject<BLUTCoefficientImageType::ImageDimension >   MaskType;
-      typename MaskType::Pointer  spatialObjectMask=NULL;
+      typename MaskType::Pointer  spatialObjectMask=ITK_NULLPTR;
       if (!m_MaskFileName.empty())
       {
           typedef itk::Image< unsigned char, BLUTCoefficientImageType::ImageDimension >   ImageMaskType;
@@ -162,23 +162,64 @@ namespace clitk
         for (unsigned int j=0; j < coefficient_images[i]->GetPixelContainer()->Size(); j++)
           params[input->GetPixelContainer()->Size() * i + j] = coefficient_images[i]->GetPixelContainer()->GetBufferPointer()[j]; 
       }
+      typename ITKTransformTypeZero::Pointer zero;
+      typename ITKTransformTypeOne::Pointer one;
+      typename ITKTransformTypeTwo::Pointer two;
+      typename ITKTransformTypeFour::Pointer four;
 
-      m_ITKTransform->SetGridOrigin(input->GetOrigin());
-      m_ITKTransform->SetGridDirection(input->GetDirection());
-      m_ITKTransform->SetGridRegion(input->GetLargestPossibleRegion());
-      m_ITKTransform->SetGridSpacing(input->GetSpacing());
-      m_ITKTransform->SetParametersByValue(params);
-
-      m_GenericTransform = m_ITKTransform;
+      switch(m_BLUTSplineOrders[0])
+      {
+        case 0:
+          zero = ITKTransformTypeZero::New();
+          zero->SetGridOrigin(input->GetOrigin());
+          zero->SetGridDirection(input->GetDirection());
+          zero->SetGridRegion(input->GetLargestPossibleRegion());
+          zero->SetGridSpacing(input->GetSpacing());
+          m_GenericTransform = zero;
+          break;
+        case 1:
+          one = ITKTransformTypeOne::New();
+          one->SetGridOrigin(input->GetOrigin());
+          one->SetGridDirection(input->GetDirection());
+          one->SetGridRegion(input->GetLargestPossibleRegion());
+          one->SetGridSpacing(input->GetSpacing());
+          m_GenericTransform = one;
+          break;
+        case 2:
+          two = ITKTransformTypeTwo::New();
+          two->SetGridOrigin(input->GetOrigin());
+          two->SetGridDirection(input->GetDirection());
+          two->SetGridRegion(input->GetLargestPossibleRegion());
+          two->SetGridSpacing(input->GetSpacing());
+          m_GenericTransform = two;
+          break;
+        case 3:
+          m_ITKTransform = ITKTransformType::New();
+          m_ITKTransform->SetGridOrigin(input->GetOrigin());
+          m_ITKTransform->SetGridDirection(input->GetDirection());
+          m_ITKTransform->SetGridRegion(input->GetLargestPossibleRegion());
+          m_ITKTransform->SetGridSpacing(input->GetSpacing());
+          m_GenericTransform = m_ITKTransform;
+          break;
+        case 4:
+          four = ITKTransformTypeFour::New();
+          four->SetGridOrigin(input->GetOrigin());
+          four->SetGridDirection(input->GetDirection());
+          four->SetGridRegion(input->GetLargestPossibleRegion());
+          four->SetGridSpacing(input->GetSpacing());
+          m_GenericTransform = four;
+          break;
+      }
+      m_GenericTransform->SetParametersByValue(params);
     }
 
 #if ITK_VERSION_MAJOR > 4 || (ITK_VERSION_MAJOR == 4 && ITK_VERSION_MINOR >= 6)
-    m_Filter->SetReferenceImage(output);
+    m_Filter->SetSize(output->GetLargestPossibleRegion().GetSize());
 #else
-    m_Filter->SetOutputOrigin(output->GetOrigin());
-    m_Filter->SetOutputSpacing(output->GetSpacing());
     m_Filter->SetOutputSize(output->GetLargestPossibleRegion().GetSize());
 #endif
+    m_Filter->SetOutputOrigin(output->GetOrigin());
+    m_Filter->SetOutputSpacing(output->GetSpacing());
     m_Filter->SetTransform(m_GenericTransform);
 
     m_Filter->Update();