* vtk/vtkGdcmReader.cxx : bug fix when loading only 1 file.

[gdcm.git] / vtk / vtkGdcmReader.h

diff --git a/vtk/vtkGdcmReader.h b/vtk/vtkGdcmReader.h
index 418e69b992a09a2920ab79fe38c5ea14cdce39a1..284090c9a71041daa45a359b5c5dec0a5bfdcfc4 100644 (file)
--- a/vtk/vtkGdcmReader.h
+++ b/vtk/vtkGdcmReader.h
@@ -1,4 +1,4 @@
-// $Header: /cvs/public/gdcm/vtk/vtkGdcmReader.h,v 1.3 2003/05/30 18:48:36 frog Exp $
+// $Header: /cvs/public/gdcm/vtk/vtkGdcmReader.h,v 1.9 2003/07/07 10:06:36 regrain Exp $
 
 #ifndef __vtkGdcmReader_h
 #define __vtkGdcmReader_h
@@ -13,21 +13,49 @@ 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);
+
 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);
+
+  //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;
+  // 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;
-  void LoadImageInMemory(string FileName, unsigned char * Dest, size_t size);
+
+  // 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