X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmHeader.h;h=a634e1f56a425eeeb997548e4ed7264499e4698f;hb=05abd393cf82392c894dd1d852e2273b0648671d;hp=b69cb7f70246f0eb2fb0a806a011d9ac163f5b37;hpb=1d7f7845726ab0b4e4630575f629a554d5707576;p=gdcm.git diff --git a/src/gdcmHeader.h b/src/gdcmHeader.h index b69cb7f7..a634e1f5 100644 --- a/src/gdcmHeader.h +++ b/src/gdcmHeader.h @@ -1,18 +1,19 @@ -// 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 /// The purpose of an instance of gdcmHeader is to act as a container of /// all the DICOM elements and their corresponding values (and @@ -36,10 +37,9 @@ 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 @@ -51,8 +51,7 @@ private: /// ELement VALueS parsed with the SHAdow dictionary. gdcmElValSet ShaElValSet; /// Refering underlying filename. - string filename; - FILE * fp; + std::string filename; // FIXME sw should be an enum e.g. //enum EndianType { @@ -72,24 +71,23 @@ 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); // CLEAN ME: NewManualElValToPubDict is NOT called any more. - gdcmElValue* NewManualElValToPubDict(string NewTagName, string VR); + 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 gdcmElValue * ReadNextElement(void); - gdcmElValue * NewElValueByKey(guint16 group, guint16 element); - gdcmElValue * NewElValueByName(string name); + gdcmElValue * NewElValueByNumber(guint16 group, guint16 element); + gdcmElValue * NewElValueByName(std::string name); + void FindLength(gdcmElValue *); void FindVR(gdcmElValue *); void LoadElementValue(gdcmElValue *); @@ -99,6 +97,21 @@ private: 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); @@ -107,73 +120,55 @@ 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: - bool IsReadable(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 PubElValSet.GetTagHt(); }; void PrintPubElVal(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); + // 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(guint16 Group, guint16 Elem, string Value); - - gdcmElValSet GetPubElValSet() { return(PubElValSet); } - + int ReplaceOrCreateByNumber(std::string Value, guint16 Group, guint16 Elem); int GetXSize(void); int GetYSize(void); int GetZSize(void); - string GetPixelType(void); + int GetPixelSize(void); + std::string GetPixelType(void); + int Write(FILE *, FileType); };