X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocument.h;h=b5e44ad7adc6338f928e5c3e0e8688d6ba752ed1;hb=706e1257a7651c47f0e1ca224c7bf0558417b16c;hp=4166b318315212890507a498e458598a19f81144;hpb=ce8913daafe02955368fd2f07e777e86824467cc;p=gdcm.git diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h index 4166b318..b5e44ad7 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/01/25 15:44:24 $ - Version: $Revision: 1.101 $ + Date: $Date: 2005/05/03 09:43:04 $ + Version: $Revision: 1.110 $ 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,15 @@ #include #include +#define NO_SEQ 0x0000001 +#define NO_SHADOW 0x00000002 + namespace gdcm { class ValEntry; class BinEntry; class SeqEntry; class Dict; -class RLEFramesInfo; -class JPEGFragmentsInfo; //----------------------------------------------------------------------------- /** @@ -44,38 +45,40 @@ class JPEGFragmentsInfo; class GDCM_EXPORT Document : public ElementSet { public: -// Informations contained in the gdcm::Document - virtual bool IsReadable(); - FileType GetFileType(); - std::string GetTransferSyntax(); - /// returns RLEFramesInfo - RLEFramesInfo *GetRLEInfo() { return RLEInfo; } - /// returns JPEGFragmentsInfo - JPEGFragmentsInfo *GetJPEGInfo() { return JPEGInfo; } +typedef std::list ListElements; -// Dictionaries - virtual void PrintPubDict (std::ostream &os = std::cout); - virtual void PrintShaDict (std::ostream &os = std::cout); +// Loading + virtual bool Load( std::string const &filename ); - Dict* GetPubDict(); - Dict* GetShaDict(); - bool SetShaDict(Dict* dict); +// Dictionaries + Dict *GetPubDict(); + Dict *GetShaDict(); + bool SetShaDict(Dict *dict); bool SetShaDict(DictKey const &dictName); +// Informations contained in the gdcm::Document + virtual bool IsReadable(); + bool IsDicomV3(); + bool IsPapyrus(); + FileType GetFileType(); + std::string GetTransferSyntax(); + /// Return the Transfer Syntax as a string + std::string GetTransferSyntaxName(); + // Swap code /// 'Swap code' accessor (see \ref SwapCode ) int GetSwapCode() { return SwapCode; } // System access (meaning endian related !?) - uint16_t SwapShort(uint16_t); // needed by Document - uint32_t SwapLong(uint32_t); // needed by Document - uint16_t UnswapShort(uint16_t); // needed by Document - uint32_t UnswapLong(uint32_t); // needed by Document + 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);} -// Ordering of Documents - bool operator<(Document &document); - -public: // File I/O /// Accessor to \ref Filename const std::string &GetFileName() const { return Filename; } @@ -87,17 +90,17 @@ public: void WriteContent( std::ofstream *fp, FileType type ); // Content entries - virtual void LoadEntryBinArea(uint16_t group, uint16_t elem); virtual void LoadEntryBinArea(BinEntry *entry); void LoadDocEntrySafe(DocEntry *entry); + +// Ordering of Documents + bool operator<(Document &document); - /// Return the Transfer Syntax as a string - std::string GetTransferSyntaxName(); - - bool IsDicomV3(); - bool IsPapyrus(); + /// \brief Sets the LoadMode as a boolean string + /// NO_SEQ, NO_SHADOW, ... (nothing more, right now) + void SetLoadMode (int mode) { LoadMode = mode; } protected: // Methods @@ -108,11 +111,9 @@ protected: Document( std::string const &filename ); virtual ~Document(); - void ReadAndSkipEncapsulatedBasicOffsetTable(); - void ComputeRLEInfo(); - void ComputeJPEGFragmentInfo(); - // Entry - + uint16_t ReadInt16() throw ( FormatError ); + uint32_t ReadInt32() throw ( FormatError ); + void SkipBytes(uint32_t); int ComputeGroup0002Length( FileType filetype ); // Variables @@ -147,26 +148,31 @@ protected: /// After opening the file, we read HEADER_LENGTH_TO_READ bytes. static const unsigned int HEADER_LENGTH_TO_READ; - /// \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; - - /// Store the RLE frames info obtained during parsing of pixels. - RLEFramesInfo *RLEInfo; + /// List of elements to Anonymize + ListElements AnonymizeList; - /// Store the JPEG fragments info obtained during parsing of pixels. - JPEGFragmentsInfo *JPEGInfo; + /// \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 ); @@ -177,39 +183,25 @@ private: std::string GetDocEntryValue (DocEntry *entry); std::string GetDocEntryUnvalue(DocEntry *entry); - 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); - uint16_t ReadInt16() throw ( FormatError ); - uint32_t ReadInt32() throw ( FormatError ); - void SkipBytes(uint32_t); - bool ReadTag(uint16_t, uint16_t); - uint32_t ReadTagLength(uint16_t, uint16_t); - - void Initialize(); bool CheckSwap(); void SwitchByteSwapCode(); void SetMaxSizeLoadEntry(long); - void SetMaxSizePrintEntry(long); // DocEntry related utilities DocEntry *ReadNextDocEntry(); -// uint32_t GenerateFreeTagKeyInGroup(uint16_t group); -// void BuildFlatHashTableRecurse( TagDocEntryHT &builtHT, -// DocEntrySet *set ); - void HandleBrokenEndian (uint16_t &group, uint16_t &elem); void HandleOutOfGroup0002(uint16_t &group, uint16_t &elem); // Variables /// Public dictionary used to parse this header Dict *RefPubDict; - /// \brief Optional "shadow dictionary" (private elements) used to parse /// this header Dict *RefShaDict; @@ -220,12 +212,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; - -private: +// uint32_t GenerateFreeTagKeyInGroup(uint16_t group); +// void BuildFlatHashTableRecurse( TagDocEntryHT &builtHT, +// DocEntrySet *set ); };