* FIX : src/gdcmDocument.cxx Remove obvious code in the destructor

[gdcm.git] / vtk / vtkGdcmReader.h

diff --git a/vtk/vtkGdcmReader.h b/vtk/vtkGdcmReader.h
index 84f6526df5284db27068c828762588ca0390083f..d5b86bdb61883fb6e319d99b33ed25d76e364762 100644 (file)
--- a/vtk/vtkGdcmReader.h
+++ b/vtk/vtkGdcmReader.h
@@ -14,13 +14,22 @@ class vtkLookupTable;
 class VTK_EXPORT vtkGdcmReader : public vtkImageReader
 {
 public:
-   static vtkGdcmReader *New() {return new vtkGdcmReader;};
-   vtkTypeMacro(vtkGdcmReader, vtkImageReader);
+   static vtkGdcmReader *New();
+   vtkTypeRevisionMacro(vtkGdcmReader, vtkImageReader);
    void PrintSelf(ostream& os, vtkIndent indent);
 
-   void RemoveAllFileName(void);
-   void AddFileName(const char* name);
-   void SetFileName(const char *name);
+   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:
@@ -28,9 +37,9 @@ protected:
    ~vtkGdcmReader();
 
    virtual void ExecuteInformation();
-   void ExecuteData(vtkDataObject *output);
-   void BuildFileListFromPattern();
-   int CheckFileCoherence();
+   virtual void ExecuteData(vtkDataObject *output);
+   virtual void BuildFileListFromPattern();
+   virtual int CheckFileCoherence();
 
 private:
    void RemoveAllInternalFileName(void);
@@ -44,6 +53,8 @@ private:
 
 // Variables
    vtkLookupTable *LookupTable;
+   vtkTimeStamp fileTime;
+   int AllowLookupTable;
 
    //BTX
    // Number of columns of the image/volume to be loaded