X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocument.h;h=09ca0c4a89e7d5251e3114cd3ac50d44e2e24277;hb=da0bfa12abf63a06edc9d06d88ea0d3164fec1db;hp=852bdcb5eefad77a1146dcf3807131eb3365054b;hpb=fbd2698cb0545343abc2d8aefe92bab1f5b3eaa3;p=gdcm.git diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h index 852bdcb5..09ca0c4a 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/07 16:37:41 $ - Version: $Revision: 1.114 $ + Date: $Date: 2005/11/05 13:23:30 $ + Version: $Revision: 1.129 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -28,14 +28,8 @@ #include #include -#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; -class BinEntry; class SeqEntry; class Dict; @@ -45,12 +39,14 @@ class Dict; */ class GDCM_EXPORT Document : public ElementSet { -public: + gdcmTypeMacro(Document); -typedef std::list ListElements; +public: + typedef std::list ListElements; // Loading - virtual bool Load( std::string const &filename ); + //Deprecated : use SetFileName() + Load() + virtual bool Load( std::string const &filename ); virtual bool Load( ); // Dictionaries @@ -74,6 +70,7 @@ typedef std::list ListElements; // System access (meaning endian related !?) uint16_t SwapShort(uint16_t); uint32_t SwapLong(uint32_t); + double SwapDouble(double); /// \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);} @@ -85,8 +82,9 @@ typedef std::list ListElements; /// Accessor to \ref Filename const std::string &GetFileName() const { return Filename; } /// Accessor to \ref Filename - void SetFileName(std::string const &fileName) { if (Filename != fileName) - Filename = fileName, IsDocumentModified = true; } + virtual void SetFileName(std::string const &fileName) + { if (Filename != fileName) + Filename = fileName, IsDocumentModified = true; } std::ifstream *OpenFile(); bool CloseFile(); @@ -94,16 +92,17 @@ typedef std::list ListElements; // Content entries virtual void LoadEntryBinArea(uint16_t group, uint16_t elem); - virtual void LoadEntryBinArea(BinEntry *entry); + virtual void LoadEntryBinArea(DataEntry *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. - * NO_SEQ, NO_SHADOW, NO_SHADOWSEQ + * 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) @@ -111,7 +110,7 @@ typedef std::list 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 @@ -119,13 +118,12 @@ protected: // to instanciate from this class Document (only gdcm::File and // gdcm::DicomDir are meaningfull). Document(); - Document( std::string const &filename ); virtual ~Document(); uint16_t ReadInt16() throw ( FormatError ); uint32_t ReadInt32() throw ( FormatError ); void SkipBytes(uint32_t); - int ComputeGroup0002Length( FileType filetype ); + int ComputeGroup0002Length( ); // Variables /// Refering underlying filename. @@ -163,8 +161,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 @@ -172,11 +173,12 @@ protected: /// Probabely, some more to add int LoadMode; - /// Whether the gdcm::Document is already parsed/loaded - /// - False from the creation of the gdcm::Document untill + /// \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: @@ -187,14 +189,11 @@ 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(); - bool CheckDocEntryVR (VRKey k); - - std::string GetDocEntryValue (DocEntry *entry); - std::string GetDocEntryUnvalue(DocEntry *entry); + VRKey FindDocEntryVR(); + bool CheckDocEntryVR (const VRKey &k); void SkipDocEntry (DocEntry *entry); void SkipToNextDocEntry (DocEntry *entry); @@ -211,6 +210,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 @@ -224,7 +224,12 @@ private: /// this upper bound is fixed to 1024 bytes (which might look reasonable /// when one considers the definition of the various VR contents). uint32_t MaxSizeLoadEntry; - + + /// \brief to allow any inner method to know current tag Group number + uint16_t CurrentGroup; + /// \brief to allow any inner method to know current tag Element number + uint16_t CurrentElem; + // uint32_t GenerateFreeTagKeyInGroup(uint16_t group); // void BuildFlatHashTableRecurse( TagDocEntryHT &builtHT, // DocEntrySet *set );