X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmHeader.h;h=2ad78057816677f7b428910537e2bded92137654;hb=c9cba2121fd1226c229ae97686ee2f2d8b158647;hp=ae885cf8bf676eeba087465e7a5e93c3bd782127;hpb=6cf458fe8d13f8b577a62802650afc6f67c720a0;p=gdcm.git diff --git a/src/gdcmHeader.h b/src/gdcmHeader.h index ae885cf8..2ad78057 100644 --- a/src/gdcmHeader.h +++ b/src/gdcmHeader.h @@ -1,4 +1,4 @@ -// $Header: /cvs/public/gdcm/src/Attic/gdcmHeader.h,v 1.23 2003/05/12 14:32:43 frog Exp $ +// $Header: /cvs/public/gdcm/src/Attic/gdcmHeader.h,v 1.28 2003/06/20 14:17:47 jpr Exp $ #ifndef GDCMHEADER_H #define GDCMHEADER_H @@ -11,9 +11,9 @@ #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 @@ -45,13 +45,16 @@ private: /// Optional "shadow dictionary" (private elements) used to parse this /// header gdcmDict* RefShaDict; + /// 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 /// ELement VALueS parsed with the PUBlic dictionary. gdcmElValSet PubElValSet; /// ELement VALueS parsed with the SHAdow dictionary. gdcmElValSet ShaElValSet; /// Refering underlying filename. - string filename; + std::string filename; // FIXME sw should be an enum e.g. //enum EndianType { @@ -76,16 +79,17 @@ private: void CheckSwap(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 * GetDictEntryByNumber(guint16, guint16); - gdcmDictEntry * GetDictEntryByName(string name); + gdcmDictEntry * GetDictEntryByName(std::string Name); // ElValue related utilities gdcmElValue * ReadNextElement(void); gdcmElValue * NewElValueByNumber(guint16 group, guint16 element); - gdcmElValue * NewElValueByName(string name); + gdcmElValue * NewElValueByName(std::string Name); void FindLength(gdcmElValue *); void FindVR(gdcmElValue *); @@ -107,8 +111,8 @@ protected: bool OpenFile(bool exception_on_error = false) throw(gdcmFileError); bool CloseFile(void); - int write(ostream&); - int anonymize(ostream&); // FIXME : anonymize should be a friend ? + int write(std::ostream&); + int anonymize(std::ostream&); // FIXME : anonymize should be a friend ? public: bool IsReadable(void); bool IsImplicitVRLittleEndianTransferSyntax(void); @@ -125,50 +129,65 @@ public: virtual void ParseHeader(bool exception_on_error = false) throw(gdcmFormatError); gdcmHeader(const char *filename, bool exception_on_error = false); + gdcmHeader( bool exception_on_error = false); virtual ~gdcmHeader(); size_t GetPixelOffset(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 GetPubElValRepByName (std::string TagName); + std::string GetPubElValByNumber (guint16 group, guint16 element); + std::string GetPubElValRepByNumber(guint16 group, guint16 element); TagElValueHT & GetPubElVal(void) { return PubElValSet.GetTagHt(); }; - void PrintPubElVal(ostream & os = cout); - void PrintPubDict (ostream & os = cout); + void PrintPubElVal(std::ostream & os = std::cout); + void PrintPubDict (std::ostream & os = std::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 GetShaElValRepByName (std::string TagName); + std::string GetShaElValByNumber (guint16 group, guint16 element); + std::string GetShaElValRepByNumber(guint16 group, guint16 element); + + std::string GetElValByName (std::string TagName); + std::string GetElValRepByName (std::string TagName); + std::string GetElValByNumber (guint16 group, guint16 element); + std::string GetElValRepByNumber(guint16 group, guint16 element); + + int SetPubElValByName (std::string content, std::string TagName); + int SetShaElValByName (std::string content, std::string ShadowTagName); + int SetPubElValByNumber(std::string content, guint16 group, guint16 element); + + int SetShaElValByNumber(std::string content, guint16 group, guint16 element); int SetPubElValLengthByNumber(guint32 lgr, guint16 group, guint16 element); - int ReplaceOrCreateByNumber(string Value, guint16 Group, guint16 Elem); + + int ReplaceOrCreateByNumber(std::string Value, guint16 Group, guint16 Elem); + int ReplaceOrCreateByNumber(char * Value, guint16 Group, guint16 Elem); + int GetXSize(void); int GetYSize(void); - int GetZSize(void); + int GetZSize(void); + int GetBitsStored(void); + int GetSamplesPerPixel(void); int GetPixelSize(void); - string GetPixelType(void); - int Write(FILE *, FileType); + std::string GetPixelType(void); + float GetXSpacing(void); + float GetYSpacing(void); + float GetZSpacing(void); + + float GetXImagePosition(void); + float GetYImagePosition(void); + float GetZImagePosition(void); + + int Write(FILE *, FileType); }; #endif