X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmParser.h;h=cd18a817f23ffbccda29cda7fe34574b4b57c6ae;hb=d3e997d981d84fece924c52c8b513bccc6cd371a;hp=054c158a6d5ce80f7da0680e77d90aa48eab9c70;hpb=e91954ea004b606c51e8195948fb7e89a9a5b631;p=gdcm.git diff --git a/src/gdcmParser.h b/src/gdcmParser.h index 054c158a..cd18a817 100644 --- a/src/gdcmParser.h +++ b/src/gdcmParser.h @@ -18,11 +18,11 @@ typedef std::string VRKey; typedef std::string VRAtr; typedef std::map VRHT; // Value Representation Hash Table -typedef std::multimap TagHeaderEntryHT; -typedef std::pair PairHT; +typedef std::multimap TagHeaderEntryHT; +typedef std::pair PairHT; typedef std::pair IterHT; -typedef std::list ListTag; // for linking together the Elements +typedef std::list ListTag; // for linking together the Elements typedef std::string GroupKey; typedef std::map GroupHT; @@ -48,14 +48,21 @@ public: * \note 0 for Light Print; 1 for 'medium' Print, 2 for Heavy */ void SetPrintLevel(int level) { printLevel = level; }; - virtual void PrintPubEntry(std::ostream & os = std::cout); - virtual void PrintPubDict (std::ostream & os = std::cout); - virtual void PrintShaDict (std::ostream & os = std::cout); + virtual void PrintEntry(std::ostream &os = std::cout); + virtual void PrintPubDict (std::ostream &os = std::cout); + virtual void PrintShaDict (std::ostream &os = std::cout); -// Standard values and informations contained in the header +// Standard values inline std::string GetFileName(void) {return filename;} - bool IsReadable(void); +// Dictionnaries + gdcmDict *GetPubDict(void); + gdcmDict *GetShaDict(void); + bool SetShaDict(gdcmDict *dict); + bool SetShaDict(DictKey dictName); + +// Informations contained in the parser + virtual bool IsReadable(void); bool IsImplicitVRLittleEndianTransferSyntax(void); bool IsExplicitVRLittleEndianTransferSyntax(void); bool IsDeflatedExplicitVRLittleEndianTransferSyntax(void); @@ -68,19 +75,18 @@ public: * \brief returns a ref to the Dicom Header H table (multimap) * return the Dicom Header H table */ - inline TagHeaderEntryHT &GetPubEntry(void) { return tagHT; }; + inline TagHeaderEntryHT &GetEntry(void) { return tagHT; }; /** * \ingroup gdcmHeader * \brief returns a ref to the Dicom Header chained list * return the Dicom Header chained list */ - inline ListTag &GetPubListEntry(void) { return listEntries; }; + inline ListTag &GetListEntry(void) { return listEntries; }; // Read (used in gdcmFile) FILE *OpenFile(bool exception_on_error = false) throw(gdcmFileError); bool CloseFile(void); - virtual void Parse(bool exception_on_error = false) throw(gdcmFormatError); // Write (used in gdcmFile) virtual bool Write(FILE *, FileType); @@ -92,7 +98,9 @@ public: // System access inline int GetSwapCode(void) { return sw; } guint16 SwapShort(guint16); // needed by gdcmFile - guint32 SwapLong(guint32); // for JPEG Files + guint32 SwapLong(guint32); // needed by gdcmFile + guint16 UnswapShort(guint16); // needed by gdcmFile + guint32 UnswapLong(guint32); // needed by gdcmFile protected: // Entry @@ -111,11 +119,13 @@ protected: virtual void *LoadEntryVoidArea (guint16 Group, guint16 Element); virtual bool SetEntryVoidAreaByNumber(void *a, guint16 Group, guint16 Elem); + virtual void UpdateShaEntries(void); + // Header entry gdcmHeaderEntry *GetHeaderEntryByName (std::string Name); gdcmHeaderEntry *GetHeaderEntryByNumber(guint16 group, guint16 element); - void LoadHeaderEntrySafe (gdcmHeaderEntry *); + void LoadHeaderEntrySafe(gdcmHeaderEntry *); void UpdateGroupLength(bool SkipSequence = false, FileType type = ImplicitVR); void WriteEntries(FileType type, FILE *); @@ -127,13 +137,23 @@ protected: static const unsigned int HEADER_LENGTH_TO_READ; static const unsigned int MAX_SIZE_LOAD_ELEMENT_VALUE; +protected: + int enableSequences; + int printLevel; + private: // Read + void Parse(bool exception_on_error = false) throw(gdcmFormatError); + void LoadHeaderEntries (void); void LoadHeaderEntry (gdcmHeaderEntry *); void AddHeaderEntry (gdcmHeaderEntry *); void FindHeaderEntryLength(gdcmHeaderEntry *); void FindHeaderEntryVR (gdcmHeaderEntry *); + bool CheckHeaderEntryVR (gdcmHeaderEntry *, VRKey); + + std::string GetHeaderEntryValue (gdcmHeaderEntry *); + std::string GetHeaderEntryUnvalue(gdcmHeaderEntry *); void SkipHeaderEntry (gdcmHeaderEntry *); void FixHeaderEntryFoundLength(gdcmHeaderEntry *, guint32); @@ -158,6 +178,11 @@ private: gdcmHeaderEntry *ReadNextHeaderEntry (void); gdcmHeaderEntry *NewHeaderEntryByNumber(guint16 group, guint16 element); gdcmHeaderEntry *NewHeaderEntryByName (std::string Name); + gdcmDictEntry *NewVirtualDictEntry(guint16 group, guint16 element, + std::string vr = "Unknown", + std::string fourth = "Unknown", + std::string name = "Unknown"); + gdcmDictEntry *NewVirtualDictEntry(gdcmHeaderEntry *); // Deprecated (Not used) gdcmHeaderEntry *NewManualHeaderEntryToPubDict(std::string NewTagName, @@ -167,33 +192,17 @@ private: // Refering underlying filename. std::string filename; - // Pointer to the Value Representation Hash Table which contains all - // the VR of the DICOM version3 public dictionary. - gdcmVR *dicom_vr; // Not a class member for thread-safety reasons - - // Pointer to the Transfert Syntax Hash Table which contains all - // the TS of the DICOM version3 public dictionary. - gdcmTS *dicom_ts; // Not a class member for thread-safety reasons - - // Pointer to global dictionary container - gdcmDictSet *Dicts; // Not a class member for thread-safety reasons - // Public dictionary used to parse this header gdcmDict *RefPubDict; - - // Optional "shadow dictionary" (private elements) used to parse this - // header + // Optional "shadow dictionary" (private elements) used to parse this header gdcmDict *RefShaDict; TagHeaderEntryHT tagHT; // H Table (multimap), to provide fast access ListTag listEntries; // chained list, to keep the 'spacial' ordering + // true if a gdcmHeaderEntry was added post parsing int wasUpdated; - // for PrintHeader - int printLevel; - - int enableSequences; // Swap code e.g. little, big, bad-big, bad-little endian). Warning: // this code is not fixed during header parsing.