X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FvvImage.h;h=f76d2a1321d8c28849d3cd15d49b92b2382e8bd2;hb=1fea92ac237c16c1f027ffabdb42066f6f4f6114;hp=38348eece3d2db2ecc67ea8bf28d1d5f41cec4d9;hpb=916b360a5059598577cb44f87381ccb1f0514476;p=clitk.git

diff --git a/common/vvImage.h b/common/vvImage.h
index 38348ee..f76d2a1 100644
--- a/common/vvImage.h
+++ b/common/vvImage.h
@@ -21,65 +21,60 @@
 #include <iostream>
 #include <vector>
 #include <itkObjectFactory.h>
+#include <itkProcessObject.h>
+
+#include <vtkImageReslice.h>
 #include <vtkSmartPointer.h>
+#include <vtkTransform.h>
 
 class vtkImageData;
-class vtkImageReslice;
-class vtkTransform;
-class vtkImageReslice;
-class vtkAbstractTransform;
 
+//------------------------------------------------------------------------------
 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;
   int GetNumberOfSpatialDimensions();
-  ///Writes the scalar range to the provided array, which must have room for two doubles
   void GetScalarRange(double* range);
   unsigned long GetActualMemorySize();
   std::vector<double> GetSpacing();
   std::vector<double> GetOrigin() const;
   std::vector<int> GetSize();
-  std::string GetScalarTypeAsString();
+  std::string GetScalarTypeAsITKString();
   int GetNumberOfScalarComponents();
   int GetScalarSize();
-  bool IsTimeSequence();
+  bool IsTimeSequence() const;
   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 SetTimeSpacing(double s) { mTimeSpacing = s; }
+  void SetTimeOrigin(double o) { mTimeOrigin = o; }
   void UpdateReslice();
 
 private:
   vvImage();
   ~vvImage();
 
+  std::vector< ConverterPointer > mItkToVtkConverters;
   std::vector<vtkImageData*> mVtkImages;
   std::vector< vtkSmartPointer<vtkImageReslice> > mVtkImageReslice;
   vtkSmartPointer<vtkTransform> mTransform;
   double mTimeOrigin;
   double mTimeSpacing;
+  unsigned int mImageDimension;
 };
+//------------------------------------------------------------------------------
+
+#include "vvImage.txx"
 
 #endif