X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=common%2FvvImage.h;h=cc0ce76028dd3734eeeb342aa80c9de996846d05;hb=f181e8fc01dec00bc6b0c82e0e273e1bb0d292c5;hp=7dbba1f3577c2ce65b7280071fb0e81375b76f52;hpb=ef9b02c88f132a17f2292e84b4167c22e1b87f8d;p=clitk.git

diff --git a/common/vvImage.h b/common/vvImage.h
index 7dbba1f..cc0ce76 100644
--- a/common/vvImage.h
+++ b/common/vvImage.h
@@ -21,13 +21,12 @@
 #include <iostream>
 #include <vector>
 #include <itkObjectFactory.h>
+#include <itkProcessObject.h>
 #include <vtkSmartPointer.h>
 
 class vtkImageData;
 class vtkImageReslice;
 class vtkTransform;
-class vtkImageReslice;
-class vtkAbstractTransform;
 
 //------------------------------------------------------------------------------
 class vvImage : public itk::LightObject
@@ -35,12 +34,12 @@ class vvImage : public itk::LightObject
 public :
   typedef vvImage Self;
   typedef itk::SmartPointer<Self> Pointer;
+  typedef itk::ProcessObject::Pointer ConverterPointer;
   itkNewMacro(Self);
 
   void Init();
   void Reset();
-  void SetImage(std::vector<vtkImageData*> images);
-  void AddImage(vtkImageData* image);
+  template<class TItkImageType> void AddItkImage(TItkImageType *input);
   const std::vector<vtkImageData*>& GetVTKImages();
   vtkImageData* GetFirstVTKImageData();
   int GetNumberOfDimensions() const;
@@ -57,7 +56,6 @@ public :
   bool IsScalarTypeInteger();
   bool IsScalarTypeInteger(int t);
   vtkSmartPointer<vtkTransform> GetTransform();
-  void SetTransform(vtkSmartPointer<vtkTransform> transform);
   void SetTimeSpacing(double s) { mTimeSpacing = s; }
   void SetTimeOrigin(double o) { mTimeOrigin = o; }
   void UpdateReslice();
@@ -66,6 +64,7 @@ private:
   vvImage();
   ~vvImage();
 
+  std::vector< ConverterPointer > mItkToVtkConverters;
   std::vector<vtkImageData*> mVtkImages;
   std::vector< vtkSmartPointer<vtkImageReslice> > mVtkImageReslice;
   vtkSmartPointer<vtkTransform> mTransform;
@@ -74,8 +73,6 @@ private:
 };
 //------------------------------------------------------------------------------
 
-//------------------------------------------------------------------------------
-vtkImageData * CopyAndCastToFloatFrom(vtkImageData * p);
-//------------------------------------------------------------------------------
+#include "vvImage.txx"
 
 #endif