X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocument.h;h=7a9a2bf3bf33d09ef12d89147171d9645406933f;hb=01ecb467c35ed8257eabd5fd189eb645b3f2215b;hp=e7233eb029fff390ccb7fe075d98c43e2b01e406;hpb=327dfe7647e3720b0f3125f9b19397cb9afc0ed3;p=gdcm.git diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h index e7233eb0..7a9a2bf3 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/06 20:03:27 $ - Version: $Revision: 1.75 $ + Date: $Date: 2005/01/14 11:28:30 $ + Version: $Revision: 1.87 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -36,25 +36,6 @@ 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 @@ -66,12 +47,8 @@ public: virtual bool IsReadable(); FileType GetFileType(); - TransferSyntaxType GetTransferSyntax(); + std::string GetTransferSyntax(); - bool IsJPEGLossless(); - bool IsJPEG2000(); - bool IsJPEG(); - bool IsEncapsulate(); bool IsDicomV3(); RLEFramesInfo *GetRLEInfo() { return RLEInfo; } @@ -110,47 +87,43 @@ public: void WriteContent( std::ofstream *fp, FileType type ); // Content entries - virtual bool SetEntryByName (std::string const &content, - TagName const &tagName ); - virtual bool SetEntryByNumber(std::string const &content, - uint16_t group, uint16_t element); - virtual bool SetEntryByNumber(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 *GetEntryBinAreaByNumber(uint16_t group, uint16_t elem); - - virtual std::string GetEntryByName (TagName const &tagName); - virtual std::string GetEntryVRByName (TagName const &tagName); - virtual std::string GetEntryByNumber (uint16_t group, uint16_t elem); - virtual std::string GetEntryVRByNumber(uint16_t group, uint16_t elem); - virtual int GetEntryLengthByNumber(uint16_t group, uint16_t elem); - - DocEntry *GetDocEntryByNumber(uint16_t group, uint16_t element); - DocEntry *GetDocEntryByName (TagName const &tagName); - ValEntry *GetValEntryByNumber(uint16_t group, uint16_t element); - BinEntry *GetBinEntryByNumber(uint16_t group, uint16_t element); - - ValEntry *ReplaceOrCreateByNumber(std::string const &value, - uint16_t group, uint16_t elem, - TagName const &vr = GDCM_UNKNOWN); - BinEntry *ReplaceOrCreateByNumber(uint8_t* binArea, int lgth, - uint16_t group, uint16_t elem, - TagName const &vr = GDCM_UNKNOWN); - SeqEntry *ReplaceOrCreateByNumber(uint16_t group, uint16_t elem); - - bool ReplaceIfExistByNumber ( std::string const &value, - uint16_t group, uint16_t elem ); + + 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); + /*TagDocEntryHT *BuildFlatHashTable();*/ + + /// Return the Transfer Syntax as a string + std::string GetTransferSyntaxName(); protected: // Methods @@ -165,7 +138,7 @@ protected: void ComputeRLEInfo(); void ComputeJPEGFragmentInfo(); // Entry - bool CheckIfEntryExistByNumber(uint16_t group, uint16_t elem ); + bool CheckIfEntryExist(uint16_t group, uint16_t elem ); int ComputeGroup0002Length( FileType filetype ); @@ -173,11 +146,26 @@ 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 knowed 'Bad Big Endian' and 'Bad Little Endian' codes int SwapCode; + ///\brief whether we already parsed group 0002 + bool Group0002Parsed; + + ///\brief whether file has a DCM Preamble + bool HasDCMPreamble; + /// File Pointer, opened during Header parsing. std::ifstream *Fp; @@ -212,20 +200,19 @@ private: void LoadDocEntry (DocEntry *e); void FindDocEntryLength (DocEntry *e) throw ( FormatError ); + uint32_t FindDocEntryLengthOBOrOW() throw( FormatUnexpected ); std::string FindDocEntryVR(); bool CheckDocEntryVR (VRKey k); - std::string GetDocEntryValue (DocEntry *e); - std::string GetDocEntryUnvalue(DocEntry *e); - + std::string GetDocEntryValue (DocEntry *entry); + std::string GetDocEntryUnvalue(DocEntry *entry); - void SkipDocEntry (DocEntry *e); - void SkipToNextDocEntry (long offset,long readLgth); - void FixDocEntryFoundLength(DocEntry *e, uint32_t l); - bool IsDocEntryAnInteger (DocEntry *e); + void SkipDocEntry (DocEntry *entry); + void SkipToNextDocEntry (DocEntry *entry); - uint32_t FindDocEntryLengthOB() throw( FormatUnexpected ); + void FixDocEntryFoundLength(DocEntry *entry,uint32_t l); + bool IsDocEntryAnInteger (DocEntry *entry); uint16_t ReadInt16() throw ( FormatError ); uint32_t ReadInt32() throw ( FormatError ); @@ -235,7 +222,7 @@ private: void Initialise(); bool CheckSwap(); - void SwitchSwapToBigEndian(); + void SwitchByteSwapCode(); void SetMaxSizeLoadEntry(long); void SetMaxSizePrintEntry(long); @@ -243,10 +230,11 @@ private: DocEntry *ReadNextDocEntry(); uint32_t GenerateFreeTagKeyInGroup(uint16_t group); - void BuildFlatHashTableRecurse( TagDocEntryHT &builtHT, - DocEntrySet* set ); +/* 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