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

diff --git a/common/vvImage.h b/common/vvImage.h
index 0aa33a4..e48dbfa 100644
--- a/common/vvImage.h
+++ b/common/vvImage.h
@@ -1,9 +1,9 @@
 /*=========================================================================
   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
+  - 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,75 +14,66 @@
 
   - 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 vtkTransform;
-class vtkImageReslice;
-class vtkAbstractTransform;
 
-class vvImage : public itk::LightObject {
+//------------------------------------------------------------------------------
+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();
   vtkImageData* GetFirstVTKImageData();
-  
   int GetNumberOfDimensions() const;
   int GetNumberOfSpatialDimensions();
-  ///Writes the scalar range to the provided array, which must have room for two doubles
   void GetScalarRange(double* range);
   unsigned long GetActualMemorySize();
   std::vector<double> GetSpacing();
   std::vector<double> GetOrigin() const;
   std::vector<int> GetSize();
-  std::string GetScalarTypeAsString();
+  std::string GetScalarTypeAsITKString();
   int GetNumberOfScalarComponents();
   int GetScalarSize();
-  bool IsTimeSequence();
+  bool IsTimeSequence() const;
   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]);
-
+  vtkSmartPointer<vtkTransform> GetTransform();
   void SetTimeSpacing(double s) { mTimeSpacing = s; }
   void SetTimeOrigin(double o) { mTimeOrigin = o; }
+  bool HaveSameSizeAndSpacingThan(vvImage * other);
 
- private:
+private:
   vvImage();
   ~vvImage();
+
+  std::vector< ConverterPointer > mItkToVtkConverters;
   std::vector<vtkImageData*> mVtkImages;
-  vtkSmartPointer<vtkImageReslice> mVtkImageReslice;
-  vtkSmartPointer<vtkTransform> transform;
+  vtkSmartPointer<vtkTransform> mTransform;
+
   double mTimeOrigin;
   double mTimeSpacing;
-  double * origin;
+  unsigned int mImageDimension;
 };
+//------------------------------------------------------------------------------
+
+#include "vvImage.txx"
 
 #endif