X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vtk%2FvtkGdcmReader.h;h=801df34055ee95535b9b496fe81c8619dc35894e;hb=fa2b57877f1cc5617cebc29b12f7d2a2b2492b71;hp=3269574933917dfa9531e706bcd211028eb40719;hpb=4ea7bc3c49f8127b18c9e7e2f7f745e1c0265031;p=gdcm.git

diff --git a/vtk/vtkGdcmReader.h b/vtk/vtkGdcmReader.h
index 32695749..801df340 100644
--- a/vtk/vtkGdcmReader.h
+++ b/vtk/vtkGdcmReader.h
@@ -1,68 +1,110 @@
-// $Header: /cvs/public/gdcm/vtk/vtkGdcmReader.h,v 1.13 2003/11/13 13:07:50 malaterre Exp $
-
+/*=========================================================================
+                                                                                
+  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>
 
+//-----------------------------------------------------------------------------
 class vtkLookupTable;
 
-class VTK_IO_EXPORT vtkGdcmReader : public vtkImageReader
+//-----------------------------------------------------------------------------
+class VTK_EXPORT vtkGdcmReader : public vtkImageReader
 {
 public:
-  static vtkGdcmReader *New() {return new vtkGdcmReader;};
-  vtkTypeMacro(vtkGdcmReader, vtkImageReader);
-  void PrintSelf(ostream& os, vtkIndent indent);
+   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);
 
-  void RemoveAllFileName(void);
-  void AddFileName(const char* name);
-  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();
-  ~vtkGdcmReader();
-  virtual void ExecuteInformation();
-  void ExecuteData(vtkDataObject *output);
-  void BuildFileListFromPattern();
-  int CheckFileCoherence();
+   vtkGdcmReader();
+   ~vtkGdcmReader();
+
+   virtual void ExecuteInformation();
+   virtual void ExecuteData(vtkDataObject *output);
+   virtual void BuildFileListFromPattern();
+   virtual int CheckFileCoherence();
+   virtual int CheckFileCoherenceLight();
 
 private:
-  void RemoveAllInternalFileName(void);
-  void AddInternalFileName(const char* name);
-  vtkLookupTable *LookupTable;
-
-  //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;
-
-  size_t LoadImageInMemory(std::string FileName, unsigned char * Dest,
+   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
+   //ETX
+
+// Variables
+   vtkLookupTable *LookupTable;
+   vtkTimeStamp fileTime;
+   int AllowLookupTable;
+   bool LightChecking;
+
+   //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