X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vtk%2FvtkGdcmReader.h;h=b04b56d9ed7a5ced9eb31442a9c0d993d7d751b4;hb=831b4cec23815614ee2ceddff957e852d7a36fe9;hp=84f6526df5284db27068c828762588ca0390083f;hpb=844285f083c7bb09584e1875d5acf00fb08c22a0;p=gdcm.git

diff --git a/vtk/vtkGdcmReader.h b/vtk/vtkGdcmReader.h
index 84f6526d..b04b56d9 100644
--- a/vtk/vtkGdcmReader.h
+++ b/vtk/vtkGdcmReader.h
@@ -1,8 +1,26 @@
-// vtkGdcmReader.h
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: vtkGdcmReader.h,v $
+  Language:  C++
+  Date:      $Date: 2004/12/09 10:59:59 $
+  Version:   $Revision: 1.20 $
+                                                                                
+  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
+  l'Image). All rights reserved. See Doc/License.txt or
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
+                                                                                
 #ifndef __vtkGdcmReader_h
 #define __vtkGdcmReader_h
 
+#include "gdcmCommon.h" // To avoid warnings concerning the std
+
 #include <vtkImageReader.h>
 #include <list>
 #include <string>
@@ -14,13 +32,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 +55,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 +71,8 @@ private:
 
 // Variables
    vtkLookupTable *LookupTable;
+   vtkTimeStamp fileTime;
+   int AllowLookupTable;
 
    //BTX
    // Number of columns of the image/volume to be loaded