X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vtk%2FvtkGdcmReader.h;h=e3cd73c5e1b1d18e0613b6853a8d0b577188860a;hb=edd93314e949d0224c8b00b648e91fed503b1c08;hp=dbcd0faeb24314f4551f4908402897f4e98c3bb8;hpb=118a92e3ee49b6efab8ec5f5ebff1f238703c2bd;p=gdcm.git

diff --git a/vtk/vtkGdcmReader.h b/vtk/vtkGdcmReader.h
index dbcd0fae..e3cd73c5 100644
--- a/vtk/vtkGdcmReader.h
+++ b/vtk/vtkGdcmReader.h
@@ -1,4 +1,4 @@
-// $Header: /cvs/public/gdcm/vtk/vtkGdcmReader.h,v 1.2 2003/05/29 16:58:24 frog Exp $
+// $Header: /cvs/public/gdcm/vtk/vtkGdcmReader.h,v 1.11 2003/11/05 18:15:41 malaterre Exp $
 
 #ifndef __vtkGdcmReader_h
 #define __vtkGdcmReader_h
@@ -6,6 +6,7 @@
 #include <list>
 #include <string>
 #include "vtkImageReader.h"
+class vtkLookupTable;
 
 class VTK_EXPORT vtkGdcmReader : public vtkImageReader
 {
@@ -13,19 +14,53 @@ public:
   static vtkGdcmReader *New() {return new vtkGdcmReader;};
   vtkTypeMacro(vtkGdcmReader, vtkImageReader);
   void PrintSelf(ostream& os, vtkIndent indent);
+
+  void RemoveAllFileName(void);
   void AddFileName(const char* name);
   void SetFileName(const char *name);
+  vtkGetObjectMacro(LookupTable,vtkLookupTable);
+
 protected:
   vtkGdcmReader();
   ~vtkGdcmReader();
   virtual void ExecuteInformation();
   void ExecuteData(vtkDataObject *output);
-  void BuilFileListFromPattern();
-  bool CheckFileCoherence();
+  void BuildFileListFromPattern();
+  int CheckFileCoherence();
+
+private:
+  void RemoveAllInternalFileName(void);
+  void AddInternalFileName(const char* name);
+  vtkLookupTable *LookupTable;
+
+  //BTX
+  // Number of columns of the image/volume to be loaded
+  int NumColumns;
+  // Number of lines of the image/volume to be loaded
+  int NumLines;
+  // Total number of planes (or images) of the stack to be build.
+  int TotalNumberOfPlanes;
+  // Number of scalar components of the image to be loaded (1=monochrome 3=rgb)
+  int NumComponents;
+  // Type of the image[s]: 8/16/32 bits, signed/unsigned:
+  std::string ImageType;
+  // Pixel size (in number of bytes):
+  size_t PixelSize;
   // List of filenames to be read in order to build a stack of images
   // or volume. The order in the list shall be the order of the images.
-  //BTX
   std::list<std::string> FileNameList;
+
+  // List of filenames created in ExecuteInformation and used in
+  // ExecuteData.
+  // If FileNameList isn't empty, InternalFileNameList is a copy of
+  //    FileNameList
+  // Otherwise, InternalFileNameList correspond to the list of 
+  //    files patterned
+  std::list<std::string> InternalFileNameList;
+
+  size_t LoadImageInMemory(std::string FileName, unsigned char * Dest,
+                           const unsigned long UpdateProgressTarget,
+                           unsigned long & UpdateProgressCount);
   //ETX
 };
 #endif