X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmHeader.h;h=7c486e83ff73f4f51cde6eddf92467db5742a200;hb=27c61aa23c3f02def28d44dca855e54d9adb25a1;hp=7decd1219d30b16b5f5b5aba7a91cef5d8f8003f;hpb=49484255e3674c038cbf2259a8c3325c0039cd41;p=gdcm.git diff --git a/src/gdcmHeader.h b/src/gdcmHeader.h index 7decd121..7c486e83 100644 --- a/src/gdcmHeader.h +++ b/src/gdcmHeader.h @@ -4,22 +4,11 @@ #define GDCMHEADER_H #include "gdcmCommon.h" -#include "gdcmVR.h" -#include "gdcmTS.h" -#include "gdcmException.h" -#include "gdcmDictSet.h" -#include "gdcmHeaderEntry.h" -#include "gdcmHeaderEntrySet.h" -#include - -//----------------------------------------------------------------------------- -typedef std::string VRKey; -typedef std::string VRAtr; -typedef std::map VRHT; // Value Representation Hash Table +#include "gdcmParser.h" //----------------------------------------------------------------------------- /* - * \defgroup gdcmHedaer + * \defgroup gdcmHeader * \brief * The purpose of an instance of gdcmHeader is to act as a container of * all the DICOM elements and their corresponding values (and @@ -29,7 +18,7 @@ typedef std::map VRHT; // Value Representation Hash Table * The typical usage of instances of class gdcmHeader is to classify a set of * dicom files according to header information e.g. to create a file hierarchy * reflecting the Patient/Study/Serie informations, or extracting a given - * SerieId. Accesing the content (image[s] or volume[s]) is beyond the + * SerieId. Accessing the content (image[s] or volume[s]) is beyond the * functionality of this class and belongs to gdmcFile. * \note The various entries of the explicit value representation (VR) shall * be managed within a dictionary which is shared by all gdcmHeader @@ -38,23 +27,19 @@ typedef std::map VRHT; // Value Representation Hash Table * protected due to Swig limitations for as Has_a dependency between * gdcmFile and gdcmHeader. */ -class GDCM_EXPORT gdcmHeader { +class GDCM_EXPORT gdcmHeader : public gdcmParser +{ public: gdcmHeader(bool exception_on_error = false); gdcmHeader(const char *filename, bool exception_on_error = false, - bool enable_sequences = false); + bool enable_sequences = false, + bool skip_shadow = false); virtual ~gdcmHeader(); // Standard values and informations contained in the header - inline std::string GetFileName(void) {return filename;} - - bool IsReadable(void); - bool IsImplicitVRLittleEndianTransferSyntax(void); - bool IsExplicitVRLittleEndianTransferSyntax(void); - bool IsDeflatedExplicitVRLittleEndianTransferSyntax(void); - bool IsExplicitVRBigEndianTransferSyntax(void); + virtual bool IsReadable(void); bool IsJPEGBaseLineProcess1TransferSyntax(void); bool IsJPEGExtendedProcess2_4TransferSyntax(void); bool IsJPEGExtendedProcess3_5TransferSyntax(void); @@ -63,11 +48,10 @@ public: bool IsJPEGLossless(void); bool IsJPEG2000(void); bool IsDicomV3(void); - FileType GetFileType(void); // Some heuristic based accessors, end user intended // (to be move to gdcmHeaderHelper?) - int GetXSize(void); + int GetXSize(void); int GetYSize(void); int GetZSize(void); int GetBitsStored(void); @@ -96,152 +80,38 @@ public: // TODO Swig int SetShaDict(std::string filename); // TODO Swig int SetPubDict(std::string filename); -// Public element value - std::string GetPubEntryByName (std::string tagName); - std::string GetPubEntryVRByName (std::string tagName); - std::string GetPubEntryByNumber (guint16 group, guint16 element); - std::string GetPubEntryVRByNumber(guint16 group, guint16 element); - - bool SetPubEntryByName (std::string content, std::string tagName); - bool SetPubEntryByNumber(std::string content, guint16 group, guint16 element); - bool SetPubEntryLengthByNumber(guint32 lgr, guint16 group, guint16 element); - - inline ListTag & GetPubListEntry(void) { return PubEntrySet.GetListEntry();}; - inline TagHeaderEntryHT & GetPubEntry(void) { return PubEntrySet.GetTagHT(); }; - - void PrintPubEntry(std::ostream & os = std::cout); - void PrintPubDict (std::ostream & os = std::cout); - -// Element value - std::string GetEntryByName (std::string tagName); - std::string GetEntryVRByName (std::string tagName); - std::string GetEntryByNumber (guint16 group, guint16 element); - std::string GetEntryVRByNumber(guint16 group, guint16 element); - - bool SetEntryByName(std::string content,std::string tagName); -// bool SetEntryByNumber(std::string content,guint16 group, guint16 element); - -// inline ListTag & GetListEntry(void) { return PubHeaderEntrySet.GetListElem();}; -// inline TagHeaderEntryHT & GetListEntry(void) { return PubHeaderEntrySet.GetTagHt(); }; +// Entry + + inline virtual std::string GetEntryByNumber (guint16 group, guint16 element) + { return(gdcmParser::GetEntryByNumber(group,element)); } + inline virtual std::string GetEntryVRByNumber(guint16 group, guint16 element) + { return(gdcmParser::GetEntryVRByNumber(group,element)); } + + inline virtual std::string GetEntryByName (std::string tagName) + { return(gdcmParser::GetEntryByName(tagName)); } + inline virtual std::string GetEntryVRByName (std::string tagName) + { return(gdcmParser::GetEntryVRByName(tagName)); } + + inline virtual bool SetEntryByNumber(std::string content,guint16 group, guint16 element) + { return(gdcmParser::SetEntryByNumber(content,group,element)); } + inline virtual bool SetEntryByName(std::string content,std::string tagName) + { return(gdcmParser::SetEntryByName(content,tagName)); } + + inline virtual bool SetEntryLengthByNumber(guint32 l,guint16 group, guint16 element) + { return(gdcmParser::SetEntryLengthByNumber(l,group,element)); } + + inline virtual void UpdateShaEntries(void) + { gdcmParser::UpdateShaEntries(); } // Read (used in gdcmFile) - FILE *OpenFile(bool exception_on_error = false) throw(gdcmFileError); - bool CloseFile(void); - virtual void ParseHeader(bool exception_on_error = false) throw(gdcmFormatError); - -// Write (used in gdcmFile) - bool Write(FILE *, FileType); void SetImageDataSize(size_t ExpectedSize); - bool ReplaceOrCreateByNumber(std::string Value, guint16 Group, guint16 Elem); - bool ReplaceOrCreateByNumber( char * Value, guint16 Group, guint16 Elem); - bool ReplaceIfExistByNumber ( char * Value, guint16 Group, guint16 Elem); - -// System access - inline int GetSwapCode(void) { return sw; } - guint16 SwapShort(guint16); // needed by gdcmFile - guint32 SwapLong(guint32); // for JPEG Files - protected: - bool CheckIfExistByNumber(guint16 Group, guint16 Elem ); - - gdcmHeaderEntry *GetHeaderEntryByName (std::string Name); - gdcmHeaderEntry *GetHeaderEntryByNumber(guint16 group, guint16 element); - int write(std::ostream&); int anonymize(std::ostream&); // FIXME : anonymize should be a friend ? - size_t GetPubEntryOffsetByNumber (guint16 Group, guint16 Elem); - void * GetPubEntryVoidAreaByNumber(guint16 Group, guint16 Elem); - void * LoadEntryVoidArea (guint16 Group, guint16 Element); - - -// Variables - FILE * fp; - FileType filetype; // ACR, ACR_LIBIDO, ExplicitVR, ImplicitVR, Unknown - private: - // Read - void LoadHeaderEntries (void); - void LoadHeaderEntry (gdcmHeaderEntry *); - void LoadHeaderEntrySafe (gdcmHeaderEntry *); - void FindHeaderEntryLength(gdcmHeaderEntry *); - void FindHeaderEntryVR (gdcmHeaderEntry *); - - void SkipHeaderEntry (gdcmHeaderEntry *); - void FixHeaderEntryFoundLength(gdcmHeaderEntry *, guint32); - bool IsHeaderEntryAnInteger (gdcmHeaderEntry *); - - guint32 FindHeaderEntryLengthOB(void); - - guint16 ReadInt16(void); - guint32 ReadInt32(void); - void SkipBytes(guint32); - - void Initialise(void); - void CheckSwap(void); - void SwitchSwapToBigEndian(void); - void SetMaxSizeLoadElementValue(long); - - // Dict - gdcmDictEntry *GetDictEntryByName (std::string Name); - gdcmDictEntry *GetDictEntryByNumber(guint16, guint16); - - // HeaderEntry related utilities - gdcmHeaderEntry *ReadNextHeaderEntry (void); - gdcmHeaderEntry *NewHeaderEntryByNumber(guint16 group, guint16 element); - gdcmHeaderEntry *NewHeaderEntryByName (std::string Name); - - // Deprecated (Not used) - gdcmHeaderEntry *NewManualHeaderEntryToPubDict(std::string NewTagName, - std::string VR); - -// Variables - // 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 - gdcmDict *RefShaDict; - /// ELement VALueS parsed with the PUBlic dictionary. - gdcmHeaderEntrySet PubEntrySet; - - // Refering underlying filename. - std::string filename; - - int enableSequences; - int wasUpdated; // true if a gdcmHeaderEntry was added post parsing - - // FIXME sw should be an enum e.g. - //enum EndianType { - //LittleEndian, - //BadLittleEndian, - //BigEndian, - //BadBigEndian}; - // Swap code e.g. little, big, bad-big, bad-little endian). Warning: - // this code is not fixed during header parsing. - int sw; - - // Size treshold above which an element value will NOT be loaded in - // memory (to avoid loading the image/volume itself). By default, - // this upper bound is fixed to 1024 bytes (which might look reasonable - // when one considers the definition of the various VR contents). - guint32 MaxSizeLoadElementValue; - - static const unsigned int HEADER_LENGTH_TO_READ; - static const unsigned int MAX_SIZE_LOAD_ELEMENT_VALUE; }; //-----------------------------------------------------------------------------