X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vtk%2FvtkGdcmReader.h;h=9250b7f3856de83389c306035e84064914d6bf33;hb=a401c209a120a44b355e53180a5a9a8d1a3cdc4c;hp=b747f9490c03b091a892f2d8b7ca24bb38b7861b;hpb=35fea00ddb243a0d78fd679514995a8bb379803d;p=gdcm.git

diff --git a/vtk/vtkGdcmReader.h b/vtk/vtkGdcmReader.h
index b747f949..9250b7f3 100644
--- a/vtk/vtkGdcmReader.h
+++ b/vtk/vtkGdcmReader.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: vtkGdcmReader.h,v $
   Language:  C++
-  Date:      $Date: 2005/08/31 15:54:51 $
-  Version:   $Revision: 1.29 $
+  Date:      $Date: 2007/09/04 16:21:50 $
+  Version:   $Revision: 1.35 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -27,7 +27,7 @@
 #include <string>
 #include <vector>
 
-typedef void (*VOID_FUNCTION_PUINT8_PFILE_POINTER)(uint8_t *, gdcm::File *);
+typedef void (*VOID_FUNCTION_PUINT8_PFILE_POINTER)(uint8_t *, GDCM_NAME_SPACE::File *);
 
 //-----------------------------------------------------------------------------
 class vtkLookupTable;
@@ -45,15 +45,18 @@ public:
    virtual void SetFileName(const char *name);
 
    //BTX
-   void SetCoherentFileList( std::vector<gdcm::File* > *cfl) {
+   void SetCoherentFileList( std::vector<GDCM_NAME_SPACE::File* > *cfl) {
                                                       CoherentFileList = cfl; }    
    //ETX
 
-   vtkSetMacro(AllowLightChecking, bool);
-   vtkGetMacro(AllowLightChecking, bool);
-   vtkBooleanMacro(AllowLightChecking, bool);
+   //vtkSetMacro(AllowLightChecking, bool);
+   //vtkGetMacro(AllowLightChecking, bool);
+   //vtkBooleanMacro(AllowLightChecking, bool);
 
    //BTX
+   
+   /// \todo fix possible problems around VTK pipelining
+   
    void SetUserFunction (VOID_FUNCTION_PUINT8_PFILE_POINTER userFunc )
                         { UserFunction = userFunc; } 
    //ETX
@@ -66,9 +69,14 @@ public:
    vtkGetMacro(AllowLookupTable, bool);
    vtkBooleanMacro(AllowLookupTable, bool);
 
+
+   vtkSetMacro(KeepOverlays, bool);
+   vtkGetMacro(KeepOverlays, bool);
+   vtkBooleanMacro(KeepOverlays, bool);
+
    vtkGetObjectMacro(LookupTable, vtkLookupTable);
 
-// FIXME : HOW to doxygen a VTM macro?
+// FIXME : HOW to doxygen a VTK macro?
 /*
  * \ brief Sets the LoadMode as a boolean string. 
  *        gdcm.LD_NOSEQ, gdcm.LD_NOSHADOW, gdcm.LD_NOSHADOWSEQ... 
@@ -81,6 +89,15 @@ public:
    vtkSetMacro(LoadMode, int);
    vtkGetMacro(LoadMode, int);
    vtkBooleanMacro(LoadMode, int);
+ 
+/*
+ * \ brief drop images with duplicate position  
+ *         and therefore calculate ZSpacing for the whole file set
+ * @param   mode user wants to drop images with duplicate position    
+ */   
+   vtkSetMacro(DropDuplicatePositions, bool);
+   vtkGetMacro(DropDuplicatePositions, bool);
+   vtkBooleanMacro(DropDuplicatePositions, bool);      
 
 protected:
    vtkGdcmReader();
@@ -89,13 +106,13 @@ protected:
    virtual void ExecuteInformation();
    virtual void ExecuteData(vtkDataObject *output);
 
-   virtual void BuildData(vtkDataObject *output);
+   //virtual void BuildData(vtkDataObject *output); // for VTK5.0
    virtual void BuildFileListFromPattern();
    virtual void LoadFileInformation();
    virtual void UpdateFileInformation();
    //BTX
-   virtual void GetFileInformation(gdcm::File *file);
-   virtual bool TestFileInformation(gdcm::File *file);
+   virtual void GetFileInformation(GDCM_NAME_SPACE::File *file);
+   virtual bool TestFileInformation(GDCM_NAME_SPACE::File *file);
    //ETX
 
 private:
@@ -110,14 +127,14 @@ private:
                           const unsigned long updateProgressTarget,
                           unsigned long &updateProgressCount);*/
 
-   void LoadImageInMemory(gdcm::File *f, unsigned char *dest,
+   void LoadImageInMemory(GDCM_NAME_SPACE::File *f, unsigned char *dest,
                           const unsigned long updateProgressTarget,
                           unsigned long &updateProgressCount);
    //ETX
 
 // Variables
    //BTX
-   typedef std::vector<gdcm::File *> gdcmFileList;
+   typedef std::vector<GDCM_NAME_SPACE::File *> gdcmFileList;
    //ETX
 
    vtkLookupTable *LookupTable;
@@ -155,7 +172,7 @@ private:
    //    files patterned
    std::list<std::string> InternalFileNameList;
    gdcmFileList InternalFileList;
-   bool Execution;
+   //bool Execution;  // For VTK5.0
   
    //ETX
 
@@ -165,7 +182,11 @@ private:
    ///        Bit 2 : Skip Sequences inside a Shadow Group, if possible
    ///        Probabely (?), some more to add
    int LoadMode;
-
+    
+   bool DropDuplicatePositions;
+   
+   bool KeepOverlays;
+   
    /// Pointer to a user suplied function to allow modification of pixel order
    VOID_FUNCTION_PUINT8_PFILE_POINTER UserFunction;