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

diff --git a/common/vvImage.h b/common/vvImage.h
index 38348ee..07987c7 100644
--- a/common/vvImage.h
+++ b/common/vvImage.h
@@ -25,10 +25,11 @@
 
 class vtkImageData;
 class vtkImageReslice;
+class vtkGeneralTransform;
 class vtkTransform;
-class vtkImageReslice;
-class vtkAbstractTransform;
+class vtkGridTransform;
 
+//------------------------------------------------------------------------------
 class vvImage : public itk::LightObject
 {
 public :
@@ -38,37 +39,28 @@ public :
 
   void Init();
   void Reset();
-
   void SetImage(std::vector<vtkImageData*> images);
   void AddImage(vtkImageData* image);
   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 IsScalarTypeInteger();
   bool IsScalarTypeInteger(int t);
-
   vtkSmartPointer<vtkTransform> GetTransform();
+  vtkSmartPointer<vtkGridTransform> GetGridTransform();
   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:
@@ -77,9 +69,16 @@ private:
 
   std::vector<vtkImageData*> mVtkImages;
   std::vector< vtkSmartPointer<vtkImageReslice> > mVtkImageReslice;
+  vtkSmartPointer<vtkGeneralTransform> mGeneralTransform;
   vtkSmartPointer<vtkTransform> mTransform;
+  vtkSmartPointer<vtkGridTransform> mGridTransform;
   double mTimeOrigin;
   double mTimeSpacing;
 };
+//------------------------------------------------------------------------------
+
+//------------------------------------------------------------------------------
+vtkImageData * CopyAndCastToFloatFrom(vtkImageData * p);
+//------------------------------------------------------------------------------
 
 #endif