X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocument.h;h=790291e926b01a026274625b1f7cb76ce42c732d;hb=ab9b96bb7b0c77c1beaee820985debe75f04b831;hp=2371d996236c597054e5e05a3f81a12fe15cd39c;hpb=f558e91ca92b7b2b5820bebc01e000a926d0828f;p=gdcm.git

diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h
index 2371d996..790291e9 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/02/11 16:36:52 $
-  Version:   $Revision: 1.106 $
+  Date:      $Date: 2005/09/07 08:55:23 $
+  Version:   $Revision: 1.122 $
  
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -45,6 +45,11 @@ public:
 
 typedef std::list<Element> ListElements;
 
+// Loading
+   //Deprecated : use SetFileName() + Load()
+   virtual bool Load( std::string const &filename ); 
+   virtual bool Load( ); 
+
 // Dictionaries
    Dict *GetPubDict();
    Dict *GetShaDict();
@@ -77,7 +82,9 @@ typedef std::list<Element> ListElements;
    /// Accessor to \ref Filename
    const std::string &GetFileName() const { return Filename; }
    /// Accessor to \ref Filename
-   void SetFileName(std::string const &fileName) { Filename = fileName; }
+   virtual void SetFileName(std::string const &fileName) 
+                   { if (Filename != fileName)
+                        Filename = fileName, IsDocumentModified = true; }
 
    std::ifstream *OpenFile();
    bool CloseFile();
@@ -88,10 +95,23 @@ 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);
 
+/**
+ * \brief Sets the LoadMode as a boolean string. 
+ *        LD_NOSEQ, LD_NOSHADOW, LD_NOSHADOWSEQ
+ ... (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) { if (LoadMode != mode) 
+                                     LoadMode=mode, IsDocumentModified = true; }
+
 protected:
 // Methods
    // Constructor and destructor are protected to forbid end user 
@@ -104,7 +124,7 @@ protected:
    uint16_t ReadInt16() throw ( FormatError );
    uint32_t ReadInt32() throw ( FormatError );
    void     SkipBytes(uint32_t);
-   int ComputeGroup0002Length( FileType filetype );
+   int ComputeGroup0002Length( );
 
 // Variables
    /// Refering underlying filename.
@@ -141,22 +161,36 @@ 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 element 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
+   ///        Bit 1 : Skip Shadow Groups if possible
+   ///        Probabely, some more to add
+   int LoadMode;
+   
+   /// \brief Whether the gdcm::Document is already parsed/loaded :
+   /// False from the creation of the gdcm::Document untill 
+   ///   gdcm::Document:Load()
+   bool IsDocumentAlreadyLoaded; // FIXME : probabely useless now
+
+   /// Whether the gdcm::Document was modified since the last Load()
+   bool IsDocumentModified;
 
 private:
 // Methods
    void Initialize();
-
+   bool DoTheLoadingDocumentJob();
    // 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 LoadDocEntry         (DocEntry *e, bool forceLoad = false);
    void FindDocEntryLength   (DocEntry *e) throw ( FormatError );
    uint32_t FindDocEntryLengthOBOrOW() throw( FormatUnexpected );
    std::string FindDocEntryVR();
@@ -168,19 +202,19 @@ 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();
 
    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
@@ -195,15 +229,9 @@ 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 );
 
 };