X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmTS.cxx;h=d3751af010960f019bbcb709a2a12d97ef3a2692;hb=e7768bbebdc9a5972e396d71a3e848f5674ee378;hp=4641bc8dacb56a260ba0169c042f76198e3fcf2e;hpb=ca18f7520f2d5bbf584bfce7883ae6dfa84261e0;p=gdcm.git diff --git a/src/gdcmTS.cxx b/src/gdcmTS.cxx index 4641bc8d..d3751af0 100644 --- a/src/gdcmTS.cxx +++ b/src/gdcmTS.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmTS.cxx,v $ Language: C++ - Date: $Date: 2005/07/02 18:09:36 $ - Version: $Revision: 1.49 $ + Date: $Date: 2007/05/23 14:18:11 $ + Version: $Revision: 1.55 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -27,19 +27,23 @@ #include // for isdigit // TODO -// a lot of troubles expected with TS : 1.2.840.113619.5.2 +// troubles expected with TS : 1.2.840.113619.5.2 // Implicit VR - Big Endian // http://www.gemedicalsystemseurope.com/euen/it_solutions/pdf/lsqxi_rev2.pdf -// +// G.E. deliberately violated a lot of Dicom rules are +// (probabely to to avoid other people to read their images) +// Just try and error on new images : +// PrintFile debug filein=... +// and fix the bugs -namespace gdcm +namespace GDCM_NAME_SPACE { //----------------------------------------------------------------------------- /// \brief Transfer Syntaxes gdcm deals with (internal use only) static const char *SpecialStrings[] = { // Implicit VR Little Endian "1.2.840.10008.1.2", - // Implicit VR Big Endian DLX (G.E Private) + // Implicit VR Big Endian (G.E Private) "1.2.840.113619.5.2", // Explicit VR Little Endian "1.2.840.10008.1.2.1", @@ -74,8 +78,14 @@ static const char *SpecialStrings[] = { "1.2.840.10008.1.2.5", // MPEG2 Main Profile @ Main Level "1.2.840.10008.1.2.4.100", + + // The following are *not* t.s. but SOP uid + // Ultrasound Image Storage (Retired) + "1.2.840.10008.5.1.4.1.1.6", + // Unknown - "Unknown Transfer Syntax" + "Unknown Transfer Syntax", // Pretty sure we never use this case... + NULL // Compilers have no obligation to finish by NULL, do it ourself }; //----------------------------------------------------------------------------- @@ -87,6 +97,7 @@ void FillDefaultTSDict(TSHT &ts); // Constructor / Destructor TS::TS() { + std::string filename = DictSet::BuildDictPath() + DICT_TS; std::ifstream from(filename.c_str()); if ( !from ) @@ -110,6 +121,7 @@ TS::TS() TsMap[key] = name; } } + from.close(); } } @@ -128,11 +140,11 @@ int TS::Count(TSKey const &key) return TsMap.count(key); } -/// \brief returns the human reabable value of a Transfer Synatx string +/// \brief returns the human readable value of a Transfer Syntax string TSAtr const &TS::GetValue(TSKey const &key) { // First thing clean up the string - // (sometime the transfer syntax is padded with spaces) + // (sometimes the transfer syntax is padded with spaces) std::string copy = key; while ( copy.size() && !isdigit((unsigned char)copy[copy.size()-1]) ) { @@ -149,8 +161,8 @@ TSAtr const &TS::GetValue(TSKey const &key) /** * \brief Determines if the key passed corresponds to a 'Transfer Syntax' * as defined in DICOM (and stored in gdcm::TS class) - * @return True when key is an actual 'Transfer Syntax'. False in all - * other cases. + * @return True when key is an actual 'Transfer Syntax'. + * False in all other cases. */ bool TS::IsTransferSyntax(TSKey const &key) { @@ -161,8 +173,8 @@ bool TS::IsTransferSyntax(TSKey const &key) /** * \brief Determines if the Transfer Syntax was already encountered * and if it corresponds to a Run Length Encoding Lossless one - * @return True when Run Length Encoding Lossless found. False in all - * other cases. + * @return True when Run Length Encoding Lossless found. + * False in all other cases. */ bool TS::IsRLELossless(TSKey const &key) { @@ -181,8 +193,8 @@ bool TS::IsRLELossless(TSKey const &key) /** * \brief Determines if the Transfer Syntax was already encountered * and if it corresponds to a 'classical' JPEG Lossless one - * @return True when 'classical' Lossless found. False in all - * other cases. + * @return True when 'classical' Lossless found. + * False in all other cases. */ bool TS::IsJPEGLossless(TSKey const &key) { @@ -203,8 +215,8 @@ bool TS::IsJPEGLossless(TSKey const &key) /** * \brief Determines if the Transfer Syntax was already encountered * and if it corresponds to a 'classical' JPEG Lossy one - * @return True when 'classical' Lossy found. False in all - * other cases. + * @return True when 'classical' Lossy found. + * False in all other cases. */ bool TS::IsJPEGLossy(TSKey const &key) { @@ -226,8 +238,8 @@ bool TS::IsJPEGLossy(TSKey const &key) /** * \brief Determines if the Transfer Syntax was already encountered * and if it corresponds to a JPEG2000 one - * @return True when JPEG2000 (Lossly or LossLess) found. False in all - * other cases. + * @return True when JPEG2000 (Lossly or LossLess) found. + * False in all other cases. */ bool TS::IsJPEG2000(TSKey const &key) { @@ -306,6 +318,24 @@ bool TS::IsMPEG(TSKey const &key) return r; } +/** + * \brief Determines if the SOP id corresponds to any form + * of UltrasoundImageStorage_Retired. + * @return True when Ultrasound Image Storage Retired. False otherwise. + */ +bool TS::IsUltrasoundImageStorage_Retired(TSKey const &key) +{ + bool r = false; + // First check this is an actual SOP id + if ( IsTransferSyntax(key) ) + { + if ( key == SpecialStrings[UltrasoundImageStorage_Retired] ) + { + r = true; + } + } + return r; +} /** * \brief GetSpecialTransferSyntax ?? * @param key TSKey const &key ?? @@ -328,7 +358,7 @@ TS::SpecialType TS::GetSpecialTransferSyntax(TSKey const &key) * @param t SpecialType t ?? * @return char* TS : SpecialStrings[t] ??. */ -const char* TS::GetSpecialTransferSyntax(SpecialType t) +const char *TS::GetSpecialTransferSyntax(SpecialType t) { return SpecialStrings[t]; } @@ -345,7 +375,7 @@ const char* TS::GetSpecialTransferSyntax(SpecialType t) * \brief Print all * @param os The output stream to be written to. */ -void TS::Print(std::ostream &os) +void TS::Print(std::ostream &os,std::string const &) { std::ostringstream s;