X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmHeader.h;h=a634e1f56a425eeeb997548e4ed7264499e4698f;hb=05abd393cf82392c894dd1d852e2273b0648671d;hp=f46a12c64961f49b7575ebffdc394e4acac864e6;hpb=d4f7a5d74be3a4a332380d24631f3d0d96f98f5f;p=gdcm.git diff --git a/src/gdcmHeader.h b/src/gdcmHeader.h index f46a12c6..a634e1f5 100644 --- a/src/gdcmHeader.h +++ b/src/gdcmHeader.h @@ -1,23 +1,24 @@ -// gdcmHeader.h +// $Header: /cvs/public/gdcm/src/Attic/gdcmHeader.h,v 1.24 2003/05/21 14:42:46 frog Exp $ #ifndef GDCMHEADER_H #define GDCMHEADER_H #include #include "gdcmCommon.h" +#include "gdcmUtil.h" #include "gdcmException.h" #include "gdcmDictSet.h" #include "gdcmElValue.h" #include "gdcmElValSet.h" -typedef string VRKey; -typedef string VRAtr; -typedef map VRHT; // Value Representation Hash Table +typedef std::string VRKey; +typedef std::string VRAtr; +typedef std::map VRHT; // Value Representation Hash Table -/// \brief The purpous of an instance of gdcmHeader is to act as a container of -/// all the DICOM elements and their corresponding values (and -/// additionaly the corresponding DICOM dictionary entry) of the header -/// of a DICOM file. +/// The purpose of an instance of gdcmHeader is to act as a container of +/// all the DICOM elements and their corresponding values (and +/// additionaly the corresponding DICOM dictionary entry) of the header +/// of a DICOM file. /// /// 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 @@ -36,22 +37,21 @@ class GDCM_EXPORT gdcmHeader { private: /// Pointer to the Value Representation Hash Table which contains all /// the VR of the DICOM version3 public dictionary. - static VRHT *dicom_vr; - - /// Global dictionary container - gdcmDictSet* Dicts; + gdcmVR *dicom_vr; // 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; /// ELement VALueS parsed with the PUBlic dictionary. - ElValSet PubElVals; + gdcmElValSet PubElValSet; /// ELement VALueS parsed with the SHAdow dictionary. - ElValSet ShaElVals; + gdcmElValSet ShaElValSet; /// Refering underlying filename. - string filename; - FILE * fp; + std::string filename; // FIXME sw should be an enum e.g. //enum EndianType { @@ -71,31 +71,47 @@ private: guint16 ReadInt16(void); guint32 ReadInt32(void); - guint16 SwapShort(guint16); - guint32 SwapLong(guint32); guint32 FindLengthOB(void); void Initialise(void); void CheckSwap(void); - void InitVRDict(void); void SwitchSwapToBigEndian(void); - void AddAndDefaultElements(void); + // CLEAN ME: NewManualElValToPubDict is NOT called any more. + gdcmElValue* NewManualElValToPubDict(std::string NewTagName, + std::string VR); void SetMaxSizeLoadElementValue(long); - gdcmDictEntry * GetDictEntryByKey(guint16, guint16); - gdcmDictEntry * GetDictEntryByName(string name); + gdcmDictEntry * GetDictEntryByNumber(guint16, guint16); + gdcmDictEntry * GetDictEntryByName(std::string name); // ElValue related utilities - ElValue * ReadNextElement(void); - ElValue * NewElValueByKey(guint16 group, guint16 element); - ElValue * NewElValueByName(string name); - void FindLength(ElValue *); - void FindVR(ElValue *); - void LoadElementValue(ElValue *); - void LoadElementValueSafe(ElValue *); - void SkipElementValue(ElValue *); - void FixFoundLength(ElValue*, guint32); - bool IsAnInteger(ElValue *); + gdcmElValue * ReadNextElement(void); + gdcmElValue * NewElValueByNumber(guint16 group, guint16 element); + gdcmElValue * NewElValueByName(std::string name); + + void FindLength(gdcmElValue *); + void FindVR(gdcmElValue *); + void LoadElementValue(gdcmElValue *); + void LoadElementValueSafe(gdcmElValue *); + void SkipElementValue(gdcmElValue *); + void FixFoundLength(gdcmElValue*, guint32); + bool IsAnInteger(gdcmElValue *); + void LoadElements(void); + +protected: + FILE * fp; + FileType filetype; + gdcmElValue * GetElValueByNumber(guint16 group, guint16 element); + + guint16 SwapShort(guint16); // needed by gdcmFile + guint32 SwapLong(guint32); // for JPEG Files :-( + bool OpenFile(bool exception_on_error = false) + throw(gdcmFileError); + bool CloseFile(void); + int write(ostream&); + int anonymize(ostream&); // FIXME : anonymize should be a friend ? +public: + bool IsReadable(void); bool IsImplicitVRLittleEndianTransferSyntax(void); bool IsExplicitVRLittleEndianTransferSyntax(void); bool IsDeflatedExplicitVRLittleEndianTransferSyntax(void); @@ -104,62 +120,56 @@ private: bool IsJPEGExtendedProcess2_4TransferSyntax(void); bool IsJPEGExtendedProcess3_5TransferSyntax(void); bool IsJPEGSpectralSelectionProcess6_8TransferSyntax(void); + bool IsJPEGLossless(void); + bool IsDicomV3(void); -protected: - // FIXME: is this enum still necessary ?? - enum FileType { - Unknown = 0, - TrueDicom, - ExplicitVR, - ImplicitVR, - ACR, - ACR_LIBIDO}; // CLEANME - FileType filetype; - int write(ostream&); - int anonymize(ostream&); // FIXME : anonymize should be a friend ? -public: - void LoadElements(void); virtual void ParseHeader(bool exception_on_error = false) throw(gdcmFormatError); - gdcmHeader(const char *filename, bool exception_on_error = false) - throw(gdcmFileError); + gdcmHeader(const char *filename, bool exception_on_error = false); virtual ~gdcmHeader(); size_t GetPixelOffset(void); - void GetPixels(size_t, void *); int GetSwapCode(void) { return sw; } - // TODO Swig int SetPubDict(string filename); + // TODO Swig int SetPubDict(std::string filename); // When some proprietary shadow groups are disclosed, we can set up // an additional specific dictionary to access extra information. - // TODO Swig int SetShaDict(string filename); + // TODO Swig int SetShaDict(std::string filename); - string GetPubElValByName(string TagName); - string GetPubElValByNumber(guint16 group, guint16 element); - string GetPubElValRepByName(string TagName); - string GetPubElValRepByNumber(guint16 group, guint16 element); + std::string GetPubElValByName(std::string TagName); + std::string GetPubElValByNumber(guint16 group, guint16 element); + std::string GetPubElValRepByName(std::string TagName); + std::string GetPubElValRepByNumber(guint16 group, guint16 element); - TagElValueHT & GetPubElVal(void) { return PubElVals.GetTagHt(); }; + TagElValueHT & GetPubElVal(void) { return PubElValSet.GetTagHt(); }; void PrintPubElVal(ostream & os = cout); - void PrintPubDict(ostream & os = cout); + void PrintPubDict (ostream & os = cout); - // TODO Swig string* GetShaTagNames(); - string GetShaElValByName(string TagName); - string GetShaElValByNumber(guint16 group, guint16 element); - string GetShaElValRepByName(string TagName); - string GetShaElValRepByNumber(guint16 group, guint16 element); - - string GetElValByName(string TagName); - string GetElValByNumber(guint16 group, guint16 element); - string GetElValRepByName(string TagName); - string GetElValRepByNumber(guint16 group, guint16 element); - - int SetPubElValByName(string content, string TagName); - int SetPubElValByNumber(string content, guint16 group, guint16 element); - int SetShaElValByName(string content, string ShadowTagName); - int SetShaElValByNumber(string content, guint16 group, guint16 element); - - ElValSet GetPubElVals() { return(PubElVals); } + // TODO Swig std::string* GetShaTagNames(); + std::string GetShaElValByName(std::string TagName); + std::string GetShaElValByNumber(guint16 group, guint16 element); + std::string GetShaElValRepByName(std::string TagName); + std::string GetShaElValRepByNumber(guint16 group, guint16 element); + + std::string GetElValByName(std::string TagName); + std::string GetElValByNumber(guint16 group, guint16 element); + std::string GetElValRepByName(std::string TagName); + std::string GetElValRepByNumber(guint16 group, guint16 element); + + int SetPubElValByName(std::string content, std::string TagName); + int SetPubElValByNumber(std::string content, guint16 group, guint16 element); + int SetShaElValByName(std::string content, std::string ShadowTagName); + int SetShaElValByNumber(std::string content, guint16 group, guint16 element); + + int SetPubElValLengthByNumber(guint32 lgr, guint16 group, guint16 element); + int ReplaceOrCreateByNumber(std::string Value, guint16 Group, guint16 Elem); + int GetXSize(void); + int GetYSize(void); + int GetZSize(void); + int GetPixelSize(void); + std::string GetPixelType(void); + int Write(FILE *, FileType); + }; #endif