X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocument.h;h=0ee2f3a07091b3b91452dfc83a6434ae7ad52f93;hb=fec6b180f2002f8fbeb80edeee57511c0b33a0d0;hp=de3ff47b45e19841340ba946c3604bf06f1aa682;hpb=4a7ecad66f0c2b5d1c13bcb8cd2529891f87b34d;p=gdcm.git

diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h
index de3ff47b..0ee2f3a0 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/03/22 11:23:51 $
-  Version:   $Revision: 1.107 $
+  Date:      $Date: 2005/06/29 15:58:33 $
+  Version:   $Revision: 1.113 $
  
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -28,9 +28,10 @@
 #include <list>
 #include <fstream>
 
-#define NO_SEQ    0x0000001
-#define NO_SHADOW 0x00000002
-
+#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
+                                  // (*exclusive* from NO_SEQ and NO_SHADOW)
 namespace gdcm 
 {
 class ValEntry;
@@ -49,7 +50,7 @@ public:
 typedef std::list<Element> ListElements;
 
 // Loading
-void Load( std::string const &filename ); 
+   virtual bool Load( std::string const &filename ); 
 
 // Dictionaries
    Dict *GetPubDict();
@@ -98,8 +99,15 @@ void Load( std::string const &filename );
 // Ordering of Documents
    bool operator<(Document &document);
 
-   /// \brief Sets the LoadMode as a boolean string
-   /// NO_SEQ, NO_SHADOW, ... (nothing more, right now)
+/**
+ * \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:
@@ -152,9 +160,20 @@ protected:
    /// are NOT loaded.
    static const unsigned int MAX_SIZE_LOAD_ELEMENT_VALUE;
 
-   /// List of element to Anonymize
+   /// List of elements to Anonymize
    ListElements AnonymizeList;
 
+   /// \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;
+   
+   /// Whether the gdcm::Document is already parsed/loaded
+   /// - False from the creation of the gdcm::Document untill 
+   ///   gdcm::Document:Load()
+   bool IsDocumentAlreadyLoaded;
+
 private:
 // Methods
    void Initialize();
@@ -205,11 +224,6 @@ private:
 //  void BuildFlatHashTableRecurse( TagDocEntryHT &builtHT,
 //                                  DocEntrySet *set );
 
-   /// \brief Bit string integer (each one considered as a boolean)
-   ///        Bit 0 : Skip Sequences,    if possible
-   ///        Bit 1 : Skip Shadow Groups if possible
-   ///        Some more to add
-   int LoadMode;
 };
 
 } // end namespace gdcm