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

diff --git a/common/vvImage.h b/common/vvImage.h
index 29573cd..e48dbfa 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,20 +14,19 @@
 
   - 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
 
 #include <iostream>
 #include <vector>
 #include <itkObjectFactory.h>
+#include <itkProcessObject.h>
+
 #include <vtkSmartPointer.h>
+#include <vtkTransform.h>
 
 class vtkImageData;
-class vtkImageReslice;
-class vtkGeneralTransform;
-class vtkTransform;
-class vtkGridTransform;
 
 //------------------------------------------------------------------------------
 class vvImage : public itk::LightObject
@@ -35,14 +34,14 @@ class vvImage : public itk::LightObject
 public :
   typedef vvImage Self;
   typedef itk::SmartPointer<Self> Pointer;
+  typedef itk::ProcessObject::Pointer ConverterPointer;
   itkNewMacro(Self);
 
   void Init();
   void Reset();
-  void SetImage(std::vector<vtkImageData*> images);
-  void AddImage(vtkImageData* image);
+  template<class TItkImageType> void AddItkImage(TItkImageType *input);
   const std::vector<vtkImageData*>& GetVTKImages();
-  vtkSmartPointer<vtkImageData> GetFirstVTKImageData();
+  vtkImageData* GetFirstVTKImageData();
   int GetNumberOfDimensions() const;
   int GetNumberOfSpatialDimensions();
   void GetScalarRange(double* range);
@@ -53,32 +52,28 @@ public :
   std::string GetScalarTypeAsITKString();
   int GetNumberOfScalarComponents();
   int GetScalarSize();
-  bool IsTimeSequence();
+  bool IsTimeSequence() const;
   bool IsScalarTypeInteger();
   bool IsScalarTypeInteger(int t);
   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();
+  bool HaveSameSizeAndSpacingThan(vvImage * other);
 
 private:
   vvImage();
   ~vvImage();
 
+  std::vector< ConverterPointer > mItkToVtkConverters;
   std::vector<vtkImageData*> mVtkImages;
-  std::vector< vtkSmartPointer<vtkImageReslice> > mVtkImageReslice;
-  vtkSmartPointer<vtkGeneralTransform> mGeneralTransform;
   vtkSmartPointer<vtkTransform> mTransform;
-  vtkSmartPointer<vtkGridTransform> mGridTransform;
+
   double mTimeOrigin;
   double mTimeSpacing;
+  unsigned int mImageDimension;
 };
 //------------------------------------------------------------------------------
 
-//------------------------------------------------------------------------------
-vtkImageData * CopyAndCastToFloatFrom(vtkImageData * p);
-//------------------------------------------------------------------------------
+#include "vvImage.txx"
 
 #endif