X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FvvImage.h;h=10ffc865fa2ed353605e4844abd6c456e5e678ee;hb=f3457815210ffe8646f3288be3362d34fcc7c3af;hp=5c38f31089e554844536385b45c112854899b5a5;hpb=c13d024475699d94ed1018a1e3be7cce91f1de97;p=clitk.git

diff --git a/common/vvImage.h b/common/vvImage.h
index 5c38f31..10ffc86 100644
--- 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,7 @@
 #include <itkObjectFactory.h>
 #include <itkProcessObject.h>
 
-#include <vtkImageReslice.h>
+#define VTK_EXCLUDE_STRSTREAM_HEADERS
 #include <vtkSmartPointer.h>
 #include <vtkTransform.h>
 
@@ -41,8 +41,8 @@ public :
   void Init();
   void Reset();
   template<class TItkImageType> void AddItkImage(TItkImageType *input);
+  void AddVtkImage(vtkImageData* input);
   const std::vector<vtkImageData*>& GetVTKImages();
-  const std::vector<vtkImageData*>& GetTransformedVTKImages();
   vtkImageData* GetFirstVTKImageData();
   int GetNumberOfDimensions() const;
   int GetNumberOfSpatialDimensions();
@@ -57,21 +57,22 @@ public :
   bool IsTimeSequence() const;
   bool IsScalarTypeInteger();
   bool IsScalarTypeInteger(int t);
-  vtkSmartPointer<vtkTransform> GetTransform();
+  const std::vector< vtkSmartPointer<vtkTransform> >& GetTransform();
   void SetTimeSpacing(double s) { mTimeSpacing = s; }
   void SetTimeOrigin(double o) { mTimeOrigin = o; }
-  void UpdateReslice();
+  bool HaveSameSizeAndSpacingThan(vvImage * other);
+  //META DATA
+  itk::MetaDataDictionary* GetFirstMetaDataDictionary();
 
 private:
   vvImage();
   ~vvImage();
 
   std::vector< ConverterPointer > mItkToVtkConverters;
-  std::vector<vtkImageData*> mVtkImages;
-
-  std::vector< vtkSmartPointer<vtkImageReslice> > mVtkImageReslice;
-  vtkSmartPointer<vtkTransform> mTransform;
-  std::vector<vtkImageData*> mTransformedVtkImages;
+  std::vector< vtkImageData* > mVtkImages;
+  std::vector< vtkSmartPointer<vtkTransform> > mTransform;
+  //META DATA
+  std::vector< itk::MetaDataDictionary* > mDictionary;
 
   double mTimeOrigin;
   double mTimeSpacing;