Merge branch 'master' of /home/dsarrut/clitk3.server

[clitk.git] / common / vvImage.h

diff --git a/common/vvImage.h b/common/vvImage.h
index 5c38f31089e554844536385b45c112854899b5a5..e48dbfa323b8a70b2e387227eced9212b33550f4 100644 (file)
--- a/common/vvImage.h
+++ b/common/vvImage.h
@@ -3,7 +3,7 @@
 
   Authors belong to:
   - University of LYON              http://www.universite-lyon.fr/
-  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
+  - Léon Bérard cancer center       http://www.centreleonberard.fr
   - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
   This software is distributed WITHOUT ANY WARRANTY; without even
@@ -14,7 +14,7 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-======================================================================-====*/
+===========================================================================**/
 #ifndef VVIMAGE_H
 #define VVIMAGE_H
 
@@ -23,7 +23,6 @@
 #include <itkObjectFactory.h>
 #include <itkProcessObject.h>
 
-#include <vtkImageReslice.h>
 #include <vtkSmartPointer.h>
 #include <vtkTransform.h>
 
@@ -42,7 +41,6 @@ public :
   void Reset();
   template<class TItkImageType> void AddItkImage(TItkImageType *input);
   const std::vector<vtkImageData*>& GetVTKImages();
-  const std::vector<vtkImageData*>& GetTransformedVTKImages();
   vtkImageData* GetFirstVTKImageData();
   int GetNumberOfDimensions() const;
   int GetNumberOfSpatialDimensions();
@@ -60,7 +58,7 @@ public :
   vtkSmartPointer<vtkTransform> GetTransform();
   void SetTimeSpacing(double s) { mTimeSpacing = s; }
   void SetTimeOrigin(double o) { mTimeOrigin = o; }
-  void UpdateReslice();
+  bool HaveSameSizeAndSpacingThan(vvImage * other);
 
 private:
   vvImage();
@@ -68,10 +66,7 @@ private:
 
   std::vector< ConverterPointer > mItkToVtkConverters;
   std::vector<vtkImageData*> mVtkImages;
-
-  std::vector< vtkSmartPointer<vtkImageReslice> > mVtkImageReslice;
   vtkSmartPointer<vtkTransform> mTransform;
-  std::vector<vtkImageData*> mTransformedVtkImages;
 
   double mTimeOrigin;
   double mTimeSpacing;