X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FvvFromITK.h;h=30e1bfe6325c3205a6cb47dee118483ce8c120a0;hb=e1098dccba022441144bfc1c44a2b58db7dde34e;hp=818705176e5f2d4701af011aed6cef7f5f216669;hpb=f0208631b72d804fd18e692a4f96acea88709023;p=clitk.git

diff --git a/common/vvFromITK.h b/common/vvFromITK.h
index 8187051..30e1bfe 100644
--- a/common/vvFromITK.h
+++ b/common/vvFromITK.h
@@ -3,7 +3,7 @@
 
   Authors belong to: 
   - University of LYON              http://www.universite-lyon.fr/
-  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
+  - Léon Bérard cancer center       http://www.centreleonberard.fr
   - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
   This software is distributed WITHOUT ANY WARRANTY; without even
@@ -14,7 +14,7 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-======================================================================-====*/
+===========================================================================**/
 #ifndef VVIMAGEFROMITK_H
 #define VVIMAGEFROMITK_H
 
@@ -23,89 +23,78 @@
 
 // itk
 #include <itkExtractImageFilter.h>
-#include <itkImageToVTKImageFilter.h>
 
 //------------------------------------------------------------------------------
 /**Converts the itk image to vv, handling the 4D problem
  * The time_sequence boolean specifies that the image is to be interpreted as a time sequence,
  * even if its dim is < 4. */
-template<unsigned int Dim, class PixelType> vvImage::Pointer vvImageFromITK(typename itk::Image<PixelType,Dim>::Pointer input, bool time_sequence=false)
+
+template<unsigned int Dim, class PixelType>
+static inline void ReadTimeSequence (vvImage::Pointer& vv_image, typename itk::Image<PixelType,Dim>::Pointer input, bool time_sequence=false)
 {
-    assert(Dim < 5 && Dim > 0); // We don't handle anything higher than 4-dimensional (for the moment :-p)
+  typedef itk::Image< PixelType, Dim > InputImageType;
+  typedef itk::Image< PixelType,  Dim - 1 >    ItkImageType;
+  typedef itk::ExtractImageFilter<InputImageType, ItkImageType> FilterType;
+
+  //extract the 3D slices and put them in a std::vector<vtkImageData*>
+  input->UpdateOutputInformation();
+  typename InputImageType::RegionType inputRegion = input->GetLargestPossibleRegion();
+  typename InputImageType::SizeType inputSize = inputRegion.GetSize();
+  typename InputImageType::IndexType start = inputRegion.GetIndex();
+  typename InputImageType::SizeType extractedRegionSize = inputSize;
+  typename InputImageType::RegionType extractedRegion;
+  extractedRegionSize[Dim - 1] = 0;
+  extractedRegion.SetSize(extractedRegionSize);
+
+  for (unsigned int i = 0; i < inputSize[Dim - 1]; i++) {
+    start[Dim - 1] = i;
+    extractedRegion.SetIndex(start);
+
+    typename FilterType::Pointer filter = FilterType::New();
+#if ITK_VERSION_MAJOR == 4
+    filter->SetDirectionCollapseToSubmatrix();
+#endif
+    filter->SetExtractionRegion(extractedRegion);
+    filter->SetInput(input);
+    filter->ReleaseDataFlagOn();
+    vv_image->AddItkImage<ItkImageType>(filter->GetOutput());
+  }
+  vv_image->SetTimeSpacing(input->GetSpacing()[Dim-1]);
+  vv_image->SetTimeOrigin(input->GetOrigin()[Dim-1]);
+}
+
+template<unsigned int Dim, class PixelType>
+struct vvImageFromITK_Impl
+{
+  static vvImage::Pointer Do (typename itk::Image<PixelType,Dim>::Pointer input, bool time_sequence=false)
+  {
     vvImage::Pointer vv_image=vvImage::New();
-    vv_image->Init(); //Delete any existing images
     typedef itk::Image< PixelType, Dim > InputImageType;
 
-    if (Dim == 4 || time_sequence) //The time sequence case: create a series of VTK images
-    {
-        typedef itk::Image< PixelType,  Dim - 1 >    ConnectorImageType;
-        typedef itk::ImageToVTKImageFilter <ConnectorImageType> ConnectorType;
-        typedef itk::ExtractImageFilter<InputImageType,ConnectorImageType> FilterType;
-
-        typename FilterType::Pointer filter = FilterType::New();
-        typename ConnectorType::Pointer connector = ConnectorType::New();
-
-        //extract the 3D slices and put them in a std::vector<vtkImageData*>
-        typename InputImageType::RegionType inputRegion = input->GetLargestPossibleRegion();
-        typename InputImageType::SizeType inputSize = inputRegion.GetSize();
-
-        typename InputImageType::SizeType extractedRegionSize = inputSize;
-        typename InputImageType::RegionType extractedRegion;
-        extractedRegionSize[Dim - 1] = 0;
-        extractedRegion.SetSize(extractedRegionSize);
-
-        filter->SetInput(input);
-        connector->SetInput(filter->GetOutput());
-
-        typename InputImageType::IndexType start = inputRegion.GetIndex();
-
-        for (unsigned int i = 0; i < inputSize[Dim - 1]; i++) {
-            start[Dim - 1] = i;
-            extractedRegion.SetIndex(start);
-            filter->SetExtractionRegion(extractedRegion);
-            try {
-                filter->Update();
-            }
-            catch ( itk::ExceptionObject & err ) {
-                std::cerr << "Error while setting vvImage from ITK (Dim==4) [Extract phase]"
-                          << " " << err << std::endl;
-                return vv_image;
-            }
-            try {
-                connector->Update();
-            }
-            catch ( itk::ExceptionObject & err ) {
-                std::cerr << "Error while setting vvImage from ITK (Dim==4) [Connect phase]"
-                          << " " << err << std::endl;
-                return vv_image;
-            }
-            vtkImageData *image = vtkImageData::New();
-            image->DeepCopy(connector->GetOutput());
-            vv_image->AddImage(image);
-        }
-        vv_image->SetTimeSpacing(input->GetSpacing()[Dim-1]);
-        vv_image->SetTimeOrigin(input->GetOrigin()[Dim-1]);        
-    }
+    if (time_sequence) //The time sequence case: create a series of VTK images
+      ReadTimeSequence<Dim,PixelType>(vv_image, input, time_sequence);
     else //Dim == 1,2,3 and not time_sequence
-    {
-        typedef itk::Image< PixelType,  Dim >    ConnectorImageType;
-        typedef itk::ImageToVTKImageFilter <ConnectorImageType> ConnectorType;
-        typename ConnectorType::Pointer connector = ConnectorType::New();
-        connector->SetInput(input);
-
-        try {
-            connector->Update();
-        }
-        catch ( itk::ExceptionObject & err ) {
-            std::cerr << "Error while setting vvImage from ITK (Dim==3)"
-                      << " " << err << std::endl;
-            return vv_image;
-        }
-        vtkImageData *image = vtkImageData::New();
-        image->DeepCopy(connector->GetOutput());
-        vv_image->AddImage(image);
-    }
+      vv_image->AddItkImage<InputImageType>(input);
+
     return vv_image;
+  }
+};
+
+template<class PixelType>
+struct vvImageFromITK_Impl<4u, PixelType>
+{
+  static vvImage::Pointer Do (typename itk::Image<PixelType,4u>::Pointer input, bool time_sequence=false)
+  {
+    vvImage::Pointer vv_image = vvImage::New();
+    ReadTimeSequence<4u,PixelType>(vv_image, input, time_sequence);
+    return vv_image;
+  }
+};
+
+template<unsigned int Dim, class PixelType> vvImage::Pointer vvImageFromITK(typename itk::Image<PixelType,Dim>::Pointer input, bool time_sequence=false)
+{
+    assert(Dim < 5 && Dim > 0); // We don't handle anything higher than 4-dimensional (for the moment :-p)
+    return vvImageFromITK_Impl<Dim, PixelType>::Do(input, time_sequence);
 }
 //------------------------------------------------------------------------------