X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vtk%2FvtkGdcmReader.h;h=801df34055ee95535b9b496fe81c8619dc35894e;hb=3910d4f8047161daeb3a0992d00e641f1d11a668;hp=32fc2fd0994a53e046328281d048fc35096104b6;hpb=b178cc9e1efeff5116c138ac66beaf0235d8c09a;p=gdcm.git

diff --git a/vtk/vtkGdcmReader.h b/vtk/vtkGdcmReader.h
index 32fc2fd0..801df340 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: 2005/04/28 09:29:05 $
+  Version:   $Revision: 1.21 $
+                                                                                
+  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,14 +32,25 @@ 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);
 
    virtual void RemoveAllFileName(void);
-   virtual void AddFileName(const char* name);
+   virtual void AddFileName(const char *name);
    virtual void SetFileName(const char *name);
-   vtkGetObjectMacro(LookupTable,vtkLookupTable);
+
+   void SetCheckFileCoherenceLight();
+   
+   // 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();
@@ -31,13 +60,14 @@ protected:
    virtual void ExecuteData(vtkDataObject *output);
    virtual void BuildFileListFromPattern();
    virtual int CheckFileCoherence();
+   virtual int CheckFileCoherenceLight();
 
 private:
    void RemoveAllInternalFileName(void);
    void AddInternalFileName(const char* name);
 
    //BTX
-   size_t LoadImageInMemory(std::string FileName, unsigned char * Dest,
+   size_t LoadImageInMemory(std::string FileName, unsigned char *Dest,
                            const unsigned long UpdateProgressTarget,
                            unsigned long & UpdateProgressCount);
    //ETX
@@ -45,6 +75,8 @@ private:
 // Variables
    vtkLookupTable *LookupTable;
    vtkTimeStamp fileTime;
+   int AllowLookupTable;
+   bool LightChecking;
 
    //BTX
    // Number of columns of the image/volume to be loaded