Should leave gdcm::Document constructor in a much quicker

[gdcm.git] / src / gdcmDocument.h

diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h
index 727d049d1780ecfe3f6f9608c2a04a5b383ce3fd..840410516f3f7d41de19f17f22da3cc8e3b7ab57 100644 (file)
--- a/src/gdcmDocument.h
+++ b/src/gdcmDocument.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocument.h,v $
   Language:  C++
-  Date:      $Date: 2005/02/02 16:18:48 $
-  Version:   $Revision: 1.104 $
+  Date:      $Date: 2005/04/26 16:18:23 $
+  Version:   $Revision: 1.109 $
  
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -28,6 +28,9 @@
 #include <list>
 #include <fstream>
 
+#define NO_SEQ    0x0000001
+#define NO_SHADOW 0x00000002
+
 namespace gdcm 
 {
 class ValEntry;
@@ -43,10 +46,15 @@ class GDCM_EXPORT Document : public ElementSet
 {
 public:
 
+typedef std::list<Element> ListElements;
+
+// Loading
+   virtual void Load( std::string const &filename ); 
+
 // Dictionaries
-   Dict* GetPubDict();
-   Dict* GetShaDict();
-   bool SetShaDict(Dict* dict);
+   Dict *GetPubDict();
+   Dict *GetShaDict();
+   bool SetShaDict(Dict *dict);
    bool SetShaDict(DictKey const &dictName);
 
 // Informations contained in the gdcm::Document
@@ -67,7 +75,7 @@ public:
    /// \brief  Unswaps back the bytes of 2-bytes long integer 
    ///         so they agree with the processor order.
    uint16_t UnswapShort(uint16_t a) { return SwapShort(a);}
-   /// \brief   Unswaps back the bytes of 4-byte long integer 
+   /// \brief  Unswaps back the bytes of 4-byte long integer 
    ///         so they agree with the processor order.
    uint32_t UnswapLong(uint32_t a) { return SwapLong(a);}
    
@@ -86,10 +94,14 @@ public:
    virtual void LoadEntryBinArea(BinEntry *entry);
 
    void LoadDocEntrySafe(DocEntry *entry);
-
+ 
 // Ordering of Documents
    bool operator<(Document &document);
 
+   /// \brief Sets the LoadMode as a boolean string
+   /// NO_SEQ, NO_SHADOW, ... (nothing more, right now)
+   void SetLoadMode (int mode) { LoadMode = mode; }
+
 protected:
 // Methods
    // Constructor and destructor are protected to forbid end user 
@@ -139,17 +151,28 @@ protected:
    /// \brief Elements whose value is longer than MAX_SIZE_LOAD_ELEMENT_VALUE
    /// are NOT loaded.
    static const unsigned int MAX_SIZE_LOAD_ELEMENT_VALUE;
-   /// \brief Elements whose value is longer than  MAX_SIZE_PRINT_ELEMENT_VALUE
-   /// are NOT printed.
-   static const unsigned int MAX_SIZE_PRINT_ELEMENT_VALUE;
+
+   /// 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
+   ///        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();
 
    // Read
-   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 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 FindDocEntryLength   (DocEntry *e) throw ( FormatError );
@@ -163,13 +186,12 @@ private:
    void SkipDocEntry          (DocEntry *entry);
    void SkipToNextDocEntry    (DocEntry *entry);
 
-   void FixDocEntryFoundLength(DocEntry *entry,uint32_t l);
+   void FixDocEntryFoundLength(DocEntry *entry, uint32_t l);
    bool IsDocEntryAnInteger   (DocEntry *entry);
 
    bool CheckSwap();
    void SwitchByteSwapCode();
    void SetMaxSizeLoadEntry(long);
-   void SetMaxSizePrintEntry(long);
 
    // DocEntry related utilities
    DocEntry *ReadNextDocEntry();
@@ -190,14 +212,10 @@ private:
    /// when one considers the definition of the various VR contents).
    uint32_t MaxSizeLoadEntry;
    
-   /// \brief Size threshold above which an element value will NOT be *printed*
-   /// in order no to polute the screen output. By default, this upper bound
-   /// is fixed to 64 bytes.
-   uint32_t MaxSizePrintEntry;   
-
 //  uint32_t GenerateFreeTagKeyInGroup(uint16_t group);
 //  void BuildFlatHashTableRecurse( TagDocEntryHT &builtHT,
-//                                   DocEntrySet *set );
+//                                  DocEntrySet *set );
+
 };
 
 } // end namespace gdcm