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

diff --git a/vtk/vtkGdcmReader.h b/vtk/vtkGdcmReader.h
index 84f6526d..fd30e58b 100644
--- a/vtk/vtkGdcmReader.h
+++ b/vtk/vtkGdcmReader.h
@@ -1,11 +1,31 @@
-// vtkGdcmReader.h
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: vtkGdcmReader.h,v $
+  Language:  C++
+  Date:      $Date: 2005/07/17 04:34:20 $
+  Version:   $Revision: 1.23 $
+                                                                                
+  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 "gdcmFile.h"
+
 #include <vtkImageReader.h>
 #include <list>
 #include <string>
+#include <vector>
 
 //-----------------------------------------------------------------------------
 class vtkLookupTable;
@@ -14,36 +34,71 @@ 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);
-   vtkGetObjectMacro(LookupTable,vtkLookupTable);
+   virtual void RemoveAllFileName(void);
+   virtual void AddFileName(const char *name);
+   virtual void SetFileName(const char *name);
+   void SetCoherentFileList( std::vector<gdcm::File* > *cfl) {
+                                                      CoherentFileList = cfl; };    
+   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);
+
+/**
+ * \brief Sets the LoadMode as a boolean string. 
+ *        NO_SEQ, NO_SHADOW, NO_SHADOWSEQ... (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();
    ~vtkGdcmReader();
 
    virtual void ExecuteInformation();
-   void ExecuteData(vtkDataObject *output);
-   void BuildFileListFromPattern();
-   int CheckFileCoherence();
-
+   virtual void ExecuteData(vtkDataObject *output);
+   virtual void BuildFileListFromPattern();
+   virtual int CheckFileCoherence();
+   virtual int CheckFileCoherenceLight();
+   virtual int CheckFileCoherenceAlreadyDone();
 private:
    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);
+   size_t LoadImageInMemory(std::string fileName, unsigned char *dest,
+                           const unsigned long updateProgressTarget,
+                           unsigned long &updateProgressCount);
+
+   size_t LoadImageInMemory(gdcm::File *f, unsigned char *dest,
+                           const unsigned long updateProgressTarget,
+                           unsigned long &updateProgressCount);
+
+   size_t DoTheLoadingJob (gdcm::File *f,
+                           unsigned char *dest,
+                           const unsigned long updateProgressTarget,
+                           unsigned long &updateProgressCount);
    //ETX
 
 // Variables
    vtkLookupTable *LookupTable;
+   vtkTimeStamp fileTime;
+   int AllowLookupTable;
+   bool LightChecking;
 
    //BTX
    // Number of columns of the image/volume to be loaded
@@ -69,7 +124,17 @@ private:
    // Otherwise, InternalFileNameList correspond to the list of 
    //    files patterned
    std::list<std::string> InternalFileNameList;
+   std::vector<gdcm::File* > *CoherentFileList;
+  
    //ETX
+
+   /// \brief Bit string integer (each one considered as a boolean)
+   ///        Bit 0 : Skip Sequences,    if possible
+   ///        Bit 1 : Skip Shadow Groups if possible
+  ///         Bit 2 : Skip Sequences inside a Shadow Group, if possible
+   ///        Probabely (?), some more to add
+   int LoadMode;
+
 };
 
 //-----------------------------------------------------------------------------