X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FvvImage.h;h=29573cd029795f3cb7a4f3ab33b33fd9bcb36086;hb=0cace02fba5ca83add8dbf179cc7dd835bd43a5e;hp=0aa33a44c31ceb1efa1cd7a87e2b96fcdefe9f07;hpb=be9eb5ee20b2e8edf258d756f0211bc47ace6973;p=clitk.git

diff --git a/common/vvImage.h b/common/vvImage.h
index 0aa33a4..29573cd 100644
--- a/common/vvImage.h
+++ b/common/vvImage.h
@@ -1,7 +1,7 @@
 /*=========================================================================
   Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
 
-  Authors belong to: 
+  Authors belong to:
   - University of LYON              http://www.universite-lyon.fr/
   - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
   - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
@@ -25,11 +25,13 @@
 
 class vtkImageData;
 class vtkImageReslice;
+class vtkGeneralTransform;
 class vtkTransform;
-class vtkImageReslice;
-class vtkAbstractTransform;
+class vtkGridTransform;
 
-class vvImage : public itk::LightObject {
+//------------------------------------------------------------------------------
+class vvImage : public itk::LightObject
+{
 public :
   typedef vvImage Self;
   typedef itk::SmartPointer<Self> Pointer;
@@ -37,52 +39,46 @@ public :
 
   void Init();
   void Reset();
-
   void SetImage(std::vector<vtkImageData*> images);
   void AddImage(vtkImageData* image);
   const std::vector<vtkImageData*>& GetVTKImages();
-  vtkImageData* GetFirstVTKImageData();
-  
+  vtkSmartPointer<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);
-  vtkAbstractTransform * GetTransform();
-  void SetTransform(vtkAbstractTransform  *transform);
-  vtkImageReslice* GetVTKImageReslice();
-  void SetVTKImageReslice(vtkImageReslice *reslice);
-  
-  void SetRotateX(int xvalue);  
-  void SetRotateY(int yvalue);  
-  void SetRotateZ(int zvalue);
-
-  void SetTranslationX(int xvalue);  
-  void SetTranslationY(int yvalue);  
-  void SetTranslationZ(int zvalue);
-  void SetOrigin(double value[3]);
-
+  vtkSmartPointer<vtkTransform> GetTransform();
+  vtkSmartPointer<vtkGridTransform> GetGridTransform();
+  void SetTransform(vtkSmartPointer<vtkTransform> transform);
   void SetTimeSpacing(double s) { mTimeSpacing = s; }
   void SetTimeOrigin(double o) { mTimeOrigin = o; }
+  void UpdateReslice();
 
- private:
+private:
   vvImage();
   ~vvImage();
+
   std::vector<vtkImageData*> mVtkImages;
-  vtkSmartPointer<vtkImageReslice> mVtkImageReslice;
-  vtkSmartPointer<vtkTransform> transform;
+  std::vector< vtkSmartPointer<vtkImageReslice> > mVtkImageReslice;
+  vtkSmartPointer<vtkGeneralTransform> mGeneralTransform;
+  vtkSmartPointer<vtkTransform> mTransform;
+  vtkSmartPointer<vtkGridTransform> mGridTransform;
   double mTimeOrigin;
   double mTimeSpacing;
-  double * origin;
 };
+//------------------------------------------------------------------------------
+
+//------------------------------------------------------------------------------
+vtkImageData * CopyAndCastToFloatFrom(vtkImageData * p);
+//------------------------------------------------------------------------------
 
 #endif