X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocument.h;h=45388b1aeb1a6e75b3ffc605e7025a067a518d78;hb=dd9001df5c1b8d5be917f635a6316aa4f0869af7;hp=dbef76f490e6c35e4e4b3884438d17dffdab5c2f;hpb=a462ce9f1af0894cd930ab04f2e65cd80dfa7084;p=gdcm.git diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h index dbef76f4..45388b1a 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/08 15:03:59 $ - Version: $Revision: 1.78 $ + Date: $Date: 2005/01/26 17:17:31 $ + Version: $Revision: 1.102 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -22,6 +22,7 @@ #include "gdcmVR.h" #include "gdcmDict.h" #include "gdcmElementSet.h" +#include "gdcmException.h" #include #include @@ -33,51 +34,21 @@ class ValEntry; class BinEntry; class SeqEntry; class Dict; -class RLEFramesInfo; -class JPEGFragmentsInfo; - -enum TransferSyntaxType { - ImplicitVRLittleEndian = 0, - ImplicitVRLittleEndianDLXGE, - ExplicitVRLittleEndian, - DeflatedExplicitVRLittleEndian, - ExplicitVRBigEndian, - JPEGBaselineProcess1, - JPEGExtendedProcess2_4, - JPEGExtendedProcess3_5, - JPEGSpectralSelectionProcess6_8, - JPEGFullProgressionProcess10_12, - JPEGLosslessProcess14, - JPEGLosslessProcess14_1, - JPEG2000Lossless, - JPEG2000, - RLELossless, - UnknownTS -}; //----------------------------------------------------------------------------- /** - * \brief Derived by both Header and DicomDir + * \brief Derived by both gdcm::File and gdcm::DicomDir */ class GDCM_EXPORT Document : public ElementSet { public: -// Informations contained in the parser +// Informations contained in the gdcm::Document virtual bool IsReadable(); FileType GetFileType(); - TransferSyntaxType GetTransferSyntax(); - - bool IsJPEGLossless(); - bool IsJPEG2000(); - bool IsJPEG(); - bool IsEncapsulate(); - bool IsDicomV3(); - - RLEFramesInfo *GetRLEInfo() { return RLEInfo; } - JPEGFragmentsInfo *GetJPEGInfo() { return JPEGInfo; } + std::string GetTransferSyntax(); -// Dictionnaries +// Dictionaries virtual void PrintPubDict (std::ostream &os = std::cout); virtual void PrintShaDict (std::ostream &os = std::cout); @@ -90,10 +61,10 @@ public: /// 'Swap code' accessor (see \ref SwapCode ) int GetSwapCode() { return SwapCode; } // System access (meaning endian related !?) - 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 + 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 // Ordering of Documents bool operator<(Document &document); @@ -111,57 +82,29 @@ public: // Content entries - virtual bool SetEntry(std::string const &content, - uint16_t group, uint16_t element); - virtual bool SetEntry(uint8_t *content, int lgth, - uint16_t group, uint16_t element); - virtual bool SetEntry(std::string const &content,ValEntry *entry); - virtual bool SetEntry(uint8_t *content, int lgth,BinEntry *entry); - - virtual void *GetEntryBinArea(uint16_t group, uint16_t elem); - - virtual std::string GetEntry (uint16_t group, uint16_t elem); - virtual std::string GetEntryVR(uint16_t group, uint16_t elem); - virtual int GetEntryLength(uint16_t group, uint16_t elem); - - DocEntry *GetDocEntry(uint16_t group, uint16_t element); - ValEntry *GetValEntry(uint16_t group, uint16_t element); - BinEntry *GetBinEntry(uint16_t group, uint16_t element); - - ValEntry *ReplaceOrCreate(std::string const &value, - uint16_t group, uint16_t elem, - TagName const &vr = GDCM_UNKNOWN); - BinEntry *ReplaceOrCreate(uint8_t* binArea, int lgth, - uint16_t group, uint16_t elem, - TagName const &vr = GDCM_UNKNOWN); - SeqEntry *ReplaceOrCreate(uint16_t group, uint16_t elem); - - bool ReplaceIfExist ( std::string const &value, - uint16_t group, uint16_t elem ); - virtual void LoadEntryBinArea(uint16_t group, uint16_t elem); virtual void LoadEntryBinArea(BinEntry *entry); void LoadDocEntrySafe(DocEntry *entry); - TagDocEntryHT *BuildFlatHashTable(); - -// Divers - static std::string GetTransferSyntaxValue(TransferSyntaxType type); + + /// Return the Transfer Syntax as a string + std::string GetTransferSyntaxName(); + + bool IsDicomV3(); + bool IsPapyrus(); protected: // Methods // Constructor and destructor are protected to forbid end user - // to instanciate from this class Document (only Header and - // DicomDir are meaningfull). + // to instanciate from this class Document (only gdcm::File and + // gdcm::DicomDir are meaningfull). Document(); Document( std::string const &filename ); virtual ~Document(); - void ReadAndSkipEncapsulatedBasicOffsetTable(); - void ComputeRLEInfo(); - void ComputeJPEGFragmentInfo(); - // Entry - bool CheckIfEntryExist(uint16_t group, uint16_t elem ); + uint16_t ReadInt16() throw ( FormatError ); + uint32_t ReadInt32() throw ( FormatError ); + void SkipBytes(uint32_t); int ComputeGroup0002Length( FileType filetype ); @@ -169,12 +112,27 @@ protected: /// Refering underlying filename. std::string Filename; - /// \brief SWap code (e.g. Big Endian, Little Endian, Bad Big Endian, - /// Bad Little Endian) according to the processor Endianity and - /// what is written on disc. + /// \brief Swap code gives an information on the byte order of a + /// supposed to be an int32, as it's read on disc + /// (depending on the image Transfer Syntax *and* on the processor endianess) + /// as opposed as it should in memory to be dealt as an int32. + /// For instance : + /// - a 'Little Endian' image, read with a little endian processor + /// will have a SwapCode= 1234 (the order is OK; nothing to do) + /// - a 'Little Endian' image, read with a big endian procesor + /// will have a SwapCode= 4321 (the order is wrong; int32 an int16 must be + /// swapped) + /// note : values 2143, 4321, 3412 remain for the ACR-NEMA time, and + /// the well known 'Bad Big Endian' and 'Bad Little Endian' codes int SwapCode; - /// File Pointer, opened during Header parsing. + ///\brief whether we already parsed group 0002 (Meta Elements) + bool Group0002Parsed; + + ///\brief whether file has a DCM Preamble + bool HasDCMPreamble; + + /// File Pointer, opened during Document parsing. std::ifstream *Fp; /// ACR, ACR_LIBIDO, ExplicitVR, ImplicitVR, Unknown @@ -182,24 +140,13 @@ 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. - /// \todo Currently not used since collides with #define in - /// class DocEntry . See also - /// method ref Document::SetMaxSizePrintEntry() static const unsigned int MAX_SIZE_PRINT_ELEMENT_VALUE; - /// Store the RLE frames info obtained during parsing of pixels. - RLEFramesInfo *RLEInfo; - - /// Store the JPEG fragments info obtained during parsing of pixels. - JPEGFragmentsInfo *JPEGInfo; - private: // Methods // Read @@ -222,31 +169,21 @@ private: 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 Initialise(); + void Initialize(); bool CheckSwap(); - void SwitchSwapToBigEndian(); + 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 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; @@ -262,9 +199,11 @@ private: /// is fixed to 64 bytes. uint32_t MaxSizePrintEntry; -private: - friend class File; +// uint32_t GenerateFreeTagKeyInGroup(uint16_t group); +// void BuildFlatHashTableRecurse( TagDocEntryHT &builtHT, +// DocEntrySet *set ); }; + } // end namespace gdcm //-----------------------------------------------------------------------------