X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocument.h;h=b89d15c558d36c1fbad41955fd630ca39551ae5b;hb=ba8ca5c7ae54ae183c5d88dba3a8f2e3098ce017;hp=d032a38859e42591cb6dad1aec99268f7939b050;hpb=7c8b232fb62e92da08750b81d3126651f60b8f3f;p=gdcm.git

diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h
index d032a388..b89d15c5 100644
--- a/src/gdcmDocument.h
+++ b/src/gdcmDocument.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocument.h,v $
   Language:  C++
-  Date:      $Date: 2005/07/17 04:28:55 $
-  Version:   $Revision: 1.117 $
+  Date:      $Date: 2005/08/29 13:05:01 $
+  Version:   $Revision: 1.120 $
  
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -30,7 +30,8 @@
 
 #define NO_SEQ        0x00000001  // Don't load odd groups
 #define NO_SHADOW     0x00000002  // Don't load Sequences
-#define NO_SHADOWSEQ  0x00000004  // Don't load Sequences if they belong to odd group
+#define NO_SHADOWSEQ  0x00000004  // Don't load Sequences if they belong 
+                                  // to an odd group
                                   // (*exclusive* from NO_SEQ and NO_SHADOW)
 namespace gdcm 
 {
@@ -99,6 +100,7 @@ typedef std::list<Element> ListElements;
    virtual void LoadEntryBinArea(BinEntry *entry);
 
    void LoadDocEntrySafe(DocEntry *entry);
+   void AddForceLoadElement(uint16_t group, uint16_t elem);
  
 // Ordering of Documents
    bool operator<(Document &document);
@@ -113,7 +115,7 @@ typedef std::list<Element> ListElements;
  * @param   mode Load mode to be used    
  */
    void SetLoadMode (int mode) { if (LoadMode != mode) 
-                                     LoadMode = mode, IsDocumentModified = true; }
+                                     LoadMode=mode, IsDocumentModified = true; }
 
 protected:
 // Methods
@@ -165,8 +167,11 @@ protected:
    /// are NOT loaded.
    static const unsigned int MAX_SIZE_LOAD_ELEMENT_VALUE;
 
-   /// List of elements to Anonymize
-   ListElements AnonymizeList;
+   /// User supplied list of elements to Anonymize
+   ListElements UserAnonymizeList;
+
+   /// User supplied list of elements to force Load
+   ListElements UserForceLoadList;
 
    /// \brief Bit string integer (each one considered as a boolean)
    ///        Bit 0 : Skip Sequences,    if possible
@@ -190,7 +195,7 @@ private:
    void ParseDES(DocEntrySet *set, long offset, long l_max, bool delim_mode);
    void ParseSQ (SeqEntry *seq,    long offset, long l_max, bool delim_mode);
 
-   void LoadDocEntry         (DocEntry *e);
+   void LoadDocEntry         (DocEntry *e, bool forceLoad = false);
    void FindDocEntryLength   (DocEntry *e) throw ( FormatError );
    uint32_t FindDocEntryLengthOBOrOW() throw( FormatUnexpected );
    std::string FindDocEntryVR();
@@ -214,6 +219,7 @@ private:
 
    void HandleBrokenEndian  (uint16_t &group, uint16_t &elem);
    void HandleOutOfGroup0002(uint16_t &group, uint16_t &elem);
+   DocEntry *Backtrack(DocEntry *docEntry);
 
 // Variables
    /// Public dictionary used to parse this header