X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocument.h;h=a024bdef0f19e4e2c42cb3013eec509d7ec5851f;hb=1d69b92978803204089d270599133917d944c651;hp=0ddfb468f8203c49f0e692f79a3cbd01a32f1c37;hpb=332835b05f78803ae6d2e92cf95c25548a229532;p=gdcm.git diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h index 0ddfb468..a024bdef 100644 --- a/src/gdcmDocument.h +++ b/src/gdcmDocument.h @@ -3,12 +3,12 @@ Program: gdcm Module: $RCSfile: gdcmDocument.h,v $ Language: C++ - Date: $Date: 2004/09/03 15:11:35 $ - Version: $Revision: 1.35 $ + Date: $Date: 2004/10/12 04:35:45 $ + Version: $Revision: 1.50 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or - http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR @@ -25,31 +25,34 @@ #include "gdcmException.h" #include "gdcmDictSet.h" #include "gdcmDocEntry.h" - -class gdcmValEntry; -class gdcmBinEntry; -class gdcmSeqEntry; - +#include "gdcmRLEFramesInfo.h" +#include "gdcmJPEGFragmentsInfo.h" #include "gdcmDocEntrySet.h" #include "gdcmElementSet.h" +class ValEntry; +class BinEntry; +class SeqEntry; + #include #include +namespace gdcm +{ //----------------------------------------------------------------------------- /** - * \brief Derived by both gdcmHeader and gdcmDicomDir + * \brief Derived by both Header and DicomDir */ -class GDCM_EXPORT gdcmDocument : public gdcmElementSet +class GDCM_EXPORT Document : public ElementSet { -friend class gdcmFile; +friend class File; private: /// Public dictionary used to parse this header - gdcmDict *RefPubDict; + Dict *RefPubDict; /// \brief Optional "shadow dictionary" (private elements) used to parse /// this header - gdcmDict *RefShaDict; + Dict *RefShaDict; /// \brief Size threshold above which an element value will NOT be loaded /// in memory (to avoid loading the image/volume itself). By default, @@ -87,12 +90,15 @@ protected: /// \brief Elements whose value is longer than MAX_SIZE_PRINT_ELEMENT_VALUE /// are NOT printed. /// \todo Currently not used since collides with #define in - /// \ref gdcmDocEntry.cxx. See also - /// \ref gdcmDocument::SetMaxSizePrintEntry() + /// \ref DocEntry.cxx. See also + /// \ref Document::SetMaxSizePrintEntry() static const unsigned int MAX_SIZE_PRINT_ELEMENT_VALUE; - /// Will be set 1 if user asks to 'go inside' the 'sequences' (VR = "SQ") - int EnableSequences; + /// Store the RLE frames info obtained during parsing of pixels. + RLEFramesInfo RLEInfo; + + /// Store the JPEG fragments info obtained during parsing of pixels. + JPEGFragmentsInfo JPEGInfo; /// \brief Amount of printed details for each Header Entry (Dicom Element): /// 0 : stands for the least detail level. @@ -104,9 +110,9 @@ public: virtual void PrintShaDict (std::ostream &os = std::cout); // Dictionnaries - gdcmDict *GetPubDict(); - gdcmDict *GetShaDict(); - bool SetShaDict(gdcmDict *dict); + Dict *GetPubDict(); + Dict *GetShaDict(); + bool SetShaDict(Dict *dict); bool SetShaDict(DictKey const & dictName); // Informations contained in the parser @@ -116,13 +122,15 @@ public: bool IsExplicitVRLittleEndianTransferSyntax(); bool IsDeflatedExplicitVRLittleEndianTransferSyntax(); bool IsExplicitVRBigEndianTransferSyntax(); + bool IsRLELossLessTransferSyntax(); bool IsJPEGBaseLineProcess1TransferSyntax(); bool IsJPEGExtendedProcess2_4TransferSyntax(); bool IsJPEGExtendedProcess3_5TransferSyntax(); bool IsJPEGSpectralSelectionProcess6_8TransferSyntax(); - bool IsRLELossLessTransferSyntax(); bool IsJPEGLossless(); bool IsJPEG2000(); + bool IsJPEGTransferSyntax(); + bool IsEncapsulateTransferSyntax(); bool IsDicomV3(); FileType GetFileType(); @@ -132,34 +140,40 @@ public: void Write(FILE* fp, FileType type); - gdcmValEntry* ReplaceOrCreateByNumber(std::string const & value, - uint16_t group, uint16_t elem); + ValEntry* ReplaceOrCreateByNumber(std::string const & value, + uint16_t group, uint16_t elem, + std::string const & VR ="unkn"); + + BinEntry* ReplaceOrCreateByNumber(uint8_t* binArea, int lgth, + uint16_t group, uint16_t elem, + std::string const & VR="unkn"); + + SeqEntry* ReplaceOrCreateByNumber(uint16_t group, uint16_t elem); - gdcmBinEntry* ReplaceOrCreateByNumber(void *voidArea, int lgth, - uint16_t group, uint16_t elem); - gdcmSeqEntry* ReplaceOrCreateByNumber(uint16_t group, uint16_t elem); bool ReplaceIfExistByNumber ( std::string const & value, uint16_t group, uint16_t elem ); - virtual void* LoadEntryVoidArea(uint16_t group, uint16_t elem); - virtual void* LoadEntryVoidArea(gdcmBinEntry* entry); + virtual void* LoadEntryBinArea(uint16_t group, uint16_t elem); + virtual void* LoadEntryBinArea(BinEntry* entry); // System access (meaning endian related !?) - uint16_t SwapShort(uint16_t); // needed by gdcmFile - uint32_t SwapLong(uint32_t); // needed by gdcmFile - uint16_t UnswapShort(uint16_t); // needed by gdcmFile - uint32_t UnswapLong(uint32_t); // needed by gdcmFile + uint16_t SwapShort(uint16_t); // needed by File + uint32_t SwapLong(uint32_t); // needed by File + uint16_t UnswapShort(uint16_t); // needed by File + uint32_t UnswapLong(uint32_t); // needed by File protected: // Constructor and destructor are protected to forbid end user - // to instanciate from this class gdcmDocument (only gdcmHeader and - // gdcmDicomDir are meaningfull). - gdcmDocument(); - gdcmDocument( std::string const & filename ); - virtual ~gdcmDocument(); + // to instanciate from this class Document (only Header and + // DicomDir are meaningfull). + Document(); + Document( std::string const & filename ); + virtual ~Document(); - void Parse7FE0 (); + void ReadAndSkipEncapsulatedBasicOffsetTable(); + void ComputeRLEInfo(); + void ComputeJPEGFragmentInfo(); // Entry bool CheckIfEntryExistByNumber(uint16_t group, uint16_t elem ); public: @@ -173,50 +187,51 @@ public: std::string const & tagName); virtual bool SetEntryByNumber(std::string const & content, uint16_t group, uint16_t element); - virtual bool SetEntryByNumber(void *content, int lgth, + virtual bool SetEntryByNumber(uint8_t* content, int lgth, uint16_t group, uint16_t element); virtual bool SetEntryLengthByNumber(uint32_t length, uint16_t group, uint16_t element); - virtual size_t GetEntryOffsetByNumber(uint16_t group, uint16_t elem); - virtual void* GetEntryVoidAreaByNumber(uint16_t group, uint16_t elem); - virtual bool SetEntryVoidAreaByNumber(void* a, uint16_t group, + virtual size_t GetEntryOffsetByNumber (uint16_t group, uint16_t elem); + virtual void* GetEntryBinAreaByNumber(uint16_t group, uint16_t elem); + virtual bool SetEntryBinAreaByNumber(uint8_t* a, uint16_t group, uint16_t elem); virtual void UpdateShaEntries(); // Header entry - gdcmDocEntry* GetDocEntryByNumber(uint16_t group, uint16_t element); - gdcmDocEntry* GetDocEntryByName (std::string const & tagName); + DocEntry* GetDocEntryByNumber(uint16_t group, uint16_t element); + DocEntry* GetDocEntryByName (std::string const & tagName); - gdcmValEntry* GetValEntryByNumber(uint16_t group, uint16_t element); - gdcmBinEntry* GetBinEntryByNumber(uint16_t group, uint16_t element); + ValEntry* GetValEntryByNumber(uint16_t group, uint16_t element); + //BinEntry* GetBinEntryByNumber(uint16_t group, uint16_t element); - void LoadDocEntrySafe(gdcmDocEntry* entry); + void LoadDocEntrySafe(DocEntry* entry); + TagDocEntryHT* BuildFlatHashTable(); private: // Read - long ParseDES(gdcmDocEntrySet *set,long offset, long l_max, bool delim_mode); - long ParseSQ (gdcmSeqEntry *seq, long offset, long l_max, bool delim_mode); - - void LoadDocEntry (gdcmDocEntry *); - void FindDocEntryLength(gdcmDocEntry *) throw ( gdcmFormatError ); - void FindDocEntryVR (gdcmDocEntry *); - bool CheckDocEntryVR (gdcmDocEntry *, gdcmVRKey); + 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 *); + void FindDocEntryLength(DocEntry *) throw ( FormatError ); + void FindDocEntryVR (DocEntry *); + bool CheckDocEntryVR (DocEntry *, VRKey); - std::string GetDocEntryValue (gdcmDocEntry *); - std::string GetDocEntryUnvalue(gdcmDocEntry *); + std::string GetDocEntryValue (DocEntry *); + std::string GetDocEntryUnvalue(DocEntry *); - void SkipDocEntry (gdcmDocEntry *); - void SkipToNextDocEntry (gdcmDocEntry *); + void SkipDocEntry (DocEntry *); + void SkipToNextDocEntry (DocEntry *); - void FixDocEntryFoundLength(gdcmDocEntry *, uint32_t); - bool IsDocEntryAnInteger (gdcmDocEntry *); + void FixDocEntryFoundLength(DocEntry *, uint32_t); + bool IsDocEntryAnInteger (DocEntry *); - uint32_t FindDocEntryLengthOB() throw( gdcmFormatUnexpected ); + uint32_t FindDocEntryLengthOB() throw( FormatUnexpected ); - uint16_t ReadInt16() throw ( gdcmFormatError ); - uint32_t ReadInt32() throw ( gdcmFormatError ); + 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); @@ -228,9 +243,12 @@ private: void SetMaxSizePrintEntry(long); // DocEntry related utilities - gdcmDocEntry* ReadNextDocEntry(); + DocEntry* ReadNextDocEntry(); uint32_t GenerateFreeTagKeyInGroup(uint16_t group); + void BuildFlatHashTableRecurse( TagDocEntryHT& builtHT, + DocEntrySet* set ); + public: // Accessors: @@ -249,9 +267,10 @@ public: /// File pointer FILE * GetFP() { return Fp; } - bool operator<(gdcmDocument &document); + bool operator<(Document &document); }; +} // end namespace gdcm //----------------------------------------------------------------------------- #endif