X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FvvImageReader.h;h=6f3dbc3d0f3e4573f3fe6886f862c4e278dcf78a;hb=543b72e23ad001ac2a7743b9beacf48e2d0054ac;hp=2056880c0e567015c4dec4fa405d551c461568da;hpb=62c20109b437bef1b9df091dfe7728a0fdf98bbc;p=clitk.git

diff --git a/common/vvImageReader.h b/common/vvImageReader.h
index 2056880..6f3dbc3 100644
--- a/common/vvImageReader.h
+++ b/common/vvImageReader.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 vvImageReader_H
 #define vvImageReader_H
 #include <string>
@@ -35,6 +35,9 @@ public:
   IMAGEWITHTIME,
   MERGEDWITHTIME,
   VECTORFIELD,
+  VECTORFIELDWITHTIME,
+  VECTORPIXELIMAGE,
+  VECTORPIXELIMAGEWITHTIME,
   UNDEFINEDIMAGETYPE
   } LoadedImageType;
 
@@ -42,6 +45,8 @@ public:
   typedef itk::SmartPointer<Self> Pointer;
   itkNewMacro(Self);
 
+  const std::vector<std::string>& GetInputFilenames(){return mInputFilenames;}
+
   void SetInputFilename(const std::string & filename);
   void SetInputFilenames(const std::vector<std::string> & filenames);
 
@@ -54,6 +59,7 @@ public:
   }
 
   void SetSlice(unsigned int i) { mSlice = i; }
+  void SetPatientCoordinateSystem(bool patientCoordinateSystem);
 
   //====================================================================
   // Main function
@@ -82,12 +88,15 @@ protected:
   //====================================================================
   template<class InputPixelType, unsigned int VImageDimension>
   void UpdateWithDimAndInputPixelType();
+  template<class InputPixelType, unsigned int VImageDimension>
+  void UpdateWithDimAndInputVectorPixelType();
   ///Input dimension and pixel type
   int mDim;
+  bool mPatientCoordinateSystem;
   std::string mInputPixelType;
 
   //====================================================================
-  void ReadNkiImageTransform();
+//  void ReadNkiImageTransform();
   void ReadMatImageTransform();
 private:
   vvImageReader();