X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FvvImage.h;h=38348eece3d2db2ecc67ea8bf28d1d5f41cec4d9;hb=83de28515d7bbb3898d5adee7a900146c2c15d89;hp=106189f2310aea4b142d22d474efa2bac5243557;hpb=48d8569538b93bf923de2f8d5c4b9db51640978f;p=clitk.git

diff --git a/common/vvImage.h b/common/vvImage.h
index 106189f..38348ee 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
@@ -29,7 +29,8 @@ class vtkTransform;
 class vtkImageReslice;
 class vtkAbstractTransform;
 
-class vvImage : public itk::LightObject {
+class vvImage : public itk::LightObject
+{
 public :
   typedef vvImage Self;
   typedef itk::SmartPointer<Self> Pointer;
@@ -42,7 +43,7 @@ public :
   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
@@ -57,33 +58,28 @@ public :
   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]);
- private:
-
-  void SetTimeSpacing(double s) { mTimeSpacing = s; }
-  void SetTimeOrigin(double o) { mTimeOrigin = o; }
-
- private:
+
+  vtkSmartPointer<vtkTransform> GetTransform();
+  void SetTransform(vtkSmartPointer<vtkTransform> transform);
+
+  void SetTimeSpacing(double s) {
+    mTimeSpacing = s;
+  }
+  void SetTimeOrigin(double o) {
+    mTimeOrigin = o;
+  }
+
+  void UpdateReslice();
+
+private:
   vvImage();
   ~vvImage();
+
   std::vector<vtkImageData*> mVtkImages;
-  vtkSmartPointer<vtkImageReslice> mVtkImageReslice;
-  vtkSmartPointer<vtkTransform> transform;
+  std::vector< vtkSmartPointer<vtkImageReslice> > mVtkImageReslice;
+  vtkSmartPointer<vtkTransform> mTransform;
   double mTimeOrigin;
   double mTimeSpacing;
-  double * origin;
 };
 
 #endif