X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vtk%2FvtkGdcmReader.h;h=d5b86bdb61883fb6e319d99b33ed25d76e364762;hb=89763e8094465640a31f98815a3448e1e7d6ff3f;hp=418e69b992a09a2920ab79fe38c5ea14cdce39a1;hpb=2e2f451468e90a1ecc348d2d390422bb2ab08f05;p=gdcm.git

diff --git a/vtk/vtkGdcmReader.h b/vtk/vtkGdcmReader.h
index 418e69b9..d5b86bdb 100644
--- a/vtk/vtkGdcmReader.h
+++ b/vtk/vtkGdcmReader.h
@@ -1,34 +1,88 @@
-// $Header: /cvs/public/gdcm/vtk/vtkGdcmReader.h,v 1.3 2003/05/30 18:48:36 frog Exp $
-
+// vtkGdcmReader.h
+//-----------------------------------------------------------------------------
 #ifndef __vtkGdcmReader_h
 #define __vtkGdcmReader_h
 
+#include <vtkImageReader.h>
 #include <list>
 #include <string>
-#include "vtkImageReader.h"
 
+//-----------------------------------------------------------------------------
+class vtkLookupTable;
+
+//-----------------------------------------------------------------------------
 class VTK_EXPORT vtkGdcmReader : public vtkImageReader
 {
 public:
-  static vtkGdcmReader *New() {return new vtkGdcmReader;};
-  vtkTypeMacro(vtkGdcmReader, vtkImageReader);
-  void PrintSelf(ostream& os, vtkIndent indent);
-  void AddFileName(const char* name);
-  void SetFileName(const char *name);
+   static vtkGdcmReader *New();
+   vtkTypeRevisionMacro(vtkGdcmReader, vtkImageReader);
+   void PrintSelf(ostream& os, vtkIndent indent);
+
+   virtual void RemoveAllFileName(void);
+   virtual void AddFileName(const char* name);
+   virtual void SetFileName(const char *name);
+   
+   // Description:
+   // If this flag is set and the DICOM reader encounters a dicom file with 
+   // lookup table the data will be kept as unsigned chars and a lookuptable 
+   // will be exported and accessible through GetLookupTable() 
+   vtkSetMacro(AllowLookupTable,int);
+   vtkGetMacro(AllowLookupTable,int);
+   vtkBooleanMacro(AllowLookupTable,int);
+
+   vtkGetObjectMacro(LookupTable,vtkLookupTable);
+
 protected:
-  vtkGdcmReader();
-  ~vtkGdcmReader();
-  virtual void ExecuteInformation();
-  void ExecuteData(vtkDataObject *output);
-  void BuilFileListFromPattern();
-  bool CheckFileCoherence();
+   vtkGdcmReader();
+   ~vtkGdcmReader();
+
+   virtual void ExecuteInformation();
+   virtual void ExecuteData(vtkDataObject *output);
+   virtual void BuildFileListFromPattern();
+   virtual int CheckFileCoherence();
+
 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.
-  //BTX
-  std::list<std::string> FileNameList;
-  void LoadImageInMemory(string FileName, unsigned char * Dest, size_t size);
-  //ETX
+   void RemoveAllInternalFileName(void);
+   void AddInternalFileName(const char* name);
+
+   //BTX
+   size_t LoadImageInMemory(std::string FileName, unsigned char * Dest,
+                           const unsigned long UpdateProgressTarget,
+                           unsigned long & UpdateProgressCount);
+   //ETX
+
+// Variables
+   vtkLookupTable *LookupTable;
+   vtkTimeStamp fileTime;
+   int AllowLookupTable;
+
+   //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.
+   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;
+   //ETX
 };
+
+//-----------------------------------------------------------------------------
 #endif