* vtkGdcmReader is now able to read rgb dicom file.

[gdcm.git] / vtk / vtkGdcmReader.h

diff --git a/vtk/vtkGdcmReader.h b/vtk/vtkGdcmReader.h
index 7c495337a2beaf02a3d4b11d42028ce10dfddee2..6c1507b6edaf26328fc4b51b6871d389b7a2b49e 100644 (file)
--- a/vtk/vtkGdcmReader.h
+++ b/vtk/vtkGdcmReader.h
@@ -1,4 +1,4 @@
-// $Header: /cvs/public/gdcm/vtk/vtkGdcmReader.h,v 1.6 2003/06/12 14:53:01 malaterre Exp $
+// $Header: /cvs/public/gdcm/vtk/vtkGdcmReader.h,v 1.10 2003/10/03 14:48:31 malaterre Exp $
 
 #ifndef __vtkGdcmReader_h
 #define __vtkGdcmReader_h
@@ -13,8 +13,11 @@ 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();
@@ -22,7 +25,11 @@ protected:
   void ExecuteData(vtkDataObject *output);
   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;
@@ -30,6 +37,8 @@ private:
   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):
@@ -37,6 +46,15 @@ private:
   // 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.
   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);