X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocument.h;h=76ed0956d54dd1c66fd2e56723a7b7259274b979;hb=17daf7e7caceddf44e73864ee8d366613a1f0c82;hp=d032a38859e42591cb6dad1aec99268f7939b050;hpb=7c8b232fb62e92da08750b81d3126651f60b8f3f;p=gdcm.git diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h index d032a388..76ed0956 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/11/21 16:28:06 $ + Version: $Revision: 1.136 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -23,19 +23,14 @@ #include "gdcmDict.h" #include "gdcmElementSet.h" #include "gdcmException.h" +#include "gdcmDebug.h" // for LEGACY #include #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,13 +40,15 @@ class Dict; */ class GDCM_EXPORT Document : public ElementSet { -public: + gdcmTypeMacro(Document); -typedef std::list ListElements; +public: + typedef std::list ListElements; // Loading //Deprecated : use SetFileName() + Load() - virtual bool Load( std::string const &filename ); + //GDCM_LEGACY( virtual bool Load( std::string const &filename ) ); + //virtual bool Load( std::string const &filename ); virtual bool Load( ); // Dictionaries @@ -61,6 +58,7 @@ typedef std::list ListElements; bool SetShaDict(DictKey const &dictName); // Informations contained in the gdcm::Document + bool IsParsable(); virtual bool IsReadable(); bool IsDicomV3(); bool IsPapyrus(); @@ -72,15 +70,6 @@ typedef std::list ListElements; // Swap code /// 'Swap code' accessor (see \ref SwapCode ) int GetSwapCode() { return SwapCode; } - // System access (meaning endian related !?) - uint16_t SwapShort(uint16_t); - uint32_t SwapLong(uint32_t); - /// \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 - /// so they agree with the processor order. - uint32_t UnswapLong(uint32_t a) { return SwapLong(a);} // File I/O /// Accessor to \ref Filename @@ -96,16 +85,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) @@ -113,7 +103,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 @@ -121,13 +111,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. @@ -165,8 +154,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 @@ -185,19 +177,28 @@ protected: private: // Methods void Initialize(); - bool DoTheLoadingDocumentJob(); + bool DoTheLoadingDocumentJob(); + + // 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);} + /// \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);} + // 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 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); @@ -214,6 +215,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 @@ -227,7 +229,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 );