Now vtkgdcmViewer load mode is defaulted to NO_SHADOWSEQ

[gdcm.git] / vtk / vtkGdcmReader.h

diff --git a/vtk/vtkGdcmReader.h b/vtk/vtkGdcmReader.h
index b04b56d9ed7a5ced9eb31442a9c0d993d7d751b4..e419490d0beb6a6bcc7b28f4caf3ebcfc4474d41 100644 (file)
--- a/vtk/vtkGdcmReader.h
+++ b/vtk/vtkGdcmReader.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: vtkGdcmReader.h,v $
   Language:  C++
-  Date:      $Date: 2004/12/09 10:59:59 $
-  Version:   $Revision: 1.20 $
+  Date:      $Date: 2005/06/29 16:12:43 $
+  Version:   $Revision: 1.22 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -37,18 +37,30 @@ public:
    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);
+
+   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);
+   vtkSetMacro(AllowLookupTable, int);
+   vtkGetMacro(AllowLookupTable, int);
+   vtkBooleanMacro(AllowLookupTable, int);
+
+   vtkGetObjectMacro(LookupTable, vtkLookupTable);
 
-   vtkGetObjectMacro(LookupTable,vtkLookupTable);
+/**
+ * \brief Sets the LoadMode as a boolean string. 
+ *        NO_SEQ, NO_SHADOW, ... (nothing more, right now)
+ *        WARNING : before using NO_SHADOW, be sure *all* your files
+ *        contain accurate values in the 0x0000 element (if any) 
+ *        of *each* Shadow Group. The parser will fail if the size is wrong !
+ * @param   mode Load mode to be used    
+ */
+   void SetLoadMode (int mode) { LoadMode = mode; }
 
 protected:
    vtkGdcmReader();
@@ -58,13 +70,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
@@ -73,6 +86,7 @@ private:
    vtkLookupTable *LookupTable;
    vtkTimeStamp fileTime;
    int AllowLookupTable;
+   bool LightChecking;
 
    //BTX
    // Number of columns of the image/volume to be loaded
@@ -99,6 +113,12 @@ private:
    //    files patterned
    std::list<std::string> InternalFileNameList;
    //ETX
+
+   /// \brief Bit string integer (each one considered as a boolean)
+   ///        Bit 0 : Skip Sequences,    if possible
+   ///        Bit 1 : Skip Shadow Groups if possible
+   ///        Probabely, some more to add
+   int LoadMode;
 };
 
 //-----------------------------------------------------------------------------