X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FvvImage.h;h=7240be82c4ef5843a221ed34930d4b0691dc8ea5;hb=2f9fc22f1046c8aa24a0840e6c953132aca1c120;hp=a8fc87f46e5288518e89363189513ad43b956371;hpb=25e6b21607eea7d39428c109e4bc0ebe00f54ed9;p=clitk.git

diff --git a/common/vvImage.h b/common/vvImage.h
index a8fc87f..7240be8 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
 
@@ -22,11 +22,11 @@
 #include <vector>
 #include <itkObjectFactory.h>
 #include <itkProcessObject.h>
+
 #include <vtkSmartPointer.h>
+#include <vtkTransform.h>
 
 class vtkImageData;
-class vtkImageReslice;
-class vtkTransform;
 
 //------------------------------------------------------------------------------
 class vvImage : public itk::LightObject
@@ -40,6 +40,7 @@ public :
   void Init();
   void Reset();
   template<class TItkImageType> void AddItkImage(TItkImageType *input);
+  void AddVtkImage(vtkImageData* input);
   const std::vector<vtkImageData*>& GetVTKImages();
   vtkImageData* GetFirstVTKImageData();
   int GetNumberOfDimensions() const;
@@ -55,22 +56,26 @@ 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* > mVtkImages;
+  std::vector< vtkSmartPointer<vtkTransform> > mTransform;
+  //META DATA
+  std::vector< itk::MetaDataDictionary* > mDictionary;
+
   double mTimeOrigin;
   double mTimeSpacing;
-  uint mImageDimension;
+  unsigned int mImageDimension;
 };
 //------------------------------------------------------------------------------