X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmTS.cxx;h=399b2b03ecdb86357e91415badaa60753280d789;hb=9aa702d6397e3e490263a0791dd6c8ed2f3d1e83;hp=fcf4d5b3fa5212adf2d4fa87e9aaf9a2bda9f8bd;hpb=3e82e8b67eddf5d4b95b6aa2a2e2615aced4c452;p=gdcm.git diff --git a/src/gdcmTS.cxx b/src/gdcmTS.cxx index fcf4d5b3..399b2b03 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/02/02 10:02:18 $ - Version: $Revision: 1.40 $ + Date: $Date: 2005/09/20 09:09:43 $ + Version: $Revision: 1.50 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -24,16 +24,18 @@ #include #include #include +#include // for isdigit // TODO // a lot of troubles expected with TS : 1.2.840.113619.5.2 // Implicit VR - Big Endian -// see : http://www.gemedicalsystemseurope.com/euen/it_solutions/pdf/lsqxi_rev2.pdf +// http://www.gemedicalsystemseurope.com/euen/it_solutions/pdf/lsqxi_rev2.pdf // namespace gdcm { //----------------------------------------------------------------------------- +/// \brief Transfer Syntaxes gdcm deals with (internal use only) static const char *SpecialStrings[] = { // Implicit VR Little Endian "1.2.840.10008.1.2", @@ -57,7 +59,8 @@ static const char *SpecialStrings[] = { "1.2.840.10008.1.2.4.55", // JPEG Lossless, Non-Hierarchical (Process 14) "1.2.840.10008.1.2.4.57", - // JPEG Lossless, Hierarchical, First-Order Prediction (Process 14, [Selection Value 1]) + // JPEG Lossless, Hierarchical, First-Order Prediction (Process 14, + // [Selection Value 1]) "1.2.840.10008.1.2.4.70", // JPEG-LS Lossless Image Compression "1.2.840.10008.1.2.4.80", @@ -69,11 +72,15 @@ static const char *SpecialStrings[] = { "1.2.840.10008.1.2.4.91", // RLE Lossless "1.2.840.10008.1.2.5", + // MPEG2 Main Profile @ Main Level + "1.2.840.10008.1.2.4.100", // Unknown "Unknown Transfer Syntax" }; //----------------------------------------------------------------------------- +/// \brief auto generated function, to fill up the Dicom Dictionnary, +/// if relevant file is not found on user's disk void FillDefaultTSDict(TSHT &ts); //----------------------------------------------------------------------------- @@ -82,9 +89,9 @@ TS::TS() { std::string filename = DictSet::BuildDictPath() + DICT_TS; std::ifstream from(filename.c_str()); - if( !from ) + if ( !from ) { - gdcmVerboseMacro("Can't open dictionary" << filename.c_str()); + gdcmWarningMacro("Can't open dictionary" << filename.c_str()); FillDefaultTSDict( TsMap ); } else @@ -98,7 +105,7 @@ TS::TS() from >> std::ws; std::getline(from, name); - if(key != "") + if (key != "") { TsMap[key] = name; } @@ -114,14 +121,18 @@ TS::~TS() //----------------------------------------------------------------------------- // Public + +/// \brief returns occurence number of the given key int TS::Count(TSKey const &key) { return TsMap.count(key); } +/// \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 + // First thing clean up the string + // (sometimes the transfer syntax is padded with spaces) std::string copy = key; while ( copy.size() && !isdigit((unsigned char)copy[copy.size()-1]) ) { @@ -138,8 +149,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) { @@ -150,14 +161,14 @@ 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) { bool r = false; // First check this is an actual transfer syntax - if( IsTransferSyntax(key) ) + if ( IsTransferSyntax(key) ) { if ( key == SpecialStrings[RLELossless] ) { @@ -170,14 +181,14 @@ 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) { bool r = false; // First check this is an actual transfer syntax - if( IsTransferSyntax(key) ) + if ( IsTransferSyntax(key) ) { if ( key == SpecialStrings[JPEGFullProgressionProcess10_12] || key == SpecialStrings[JPEGLosslessProcess14] @@ -192,14 +203,14 @@ 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) { bool r = false; // First check this is an actual transfer syntax - if( IsTransferSyntax(key) ) + if ( IsTransferSyntax(key) ) { if ( key == SpecialStrings[JPEGBaselineProcess1] || key == SpecialStrings[JPEGExtendedProcess2_4] @@ -211,17 +222,18 @@ bool TS::IsJPEGLossy(TSKey const &key) } return r; } + /** * \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) { bool r = false; // First check this is an actual transfer syntax - if( IsTransferSyntax(key) ) + if ( IsTransferSyntax(key) ) { if ( key == SpecialStrings[JPEG2000Lossless] || key == SpecialStrings[JPEG2000] ) @@ -241,10 +253,12 @@ bool TS::IsJPEG(TSKey const &key) { bool r = false; // First check this is an actual transfer syntax - if( IsTransferSyntax(key) ) + if ( IsTransferSyntax(key) ) { if ( IsJPEGLossy( key ) || IsJPEGLossless( key ) + || IsJPEG2000( key ) + || IsJPEGLS( key ) ) { r = true; @@ -262,7 +276,7 @@ bool TS::IsJPEGLS(TSKey const &key) { bool r = false; // First check this is an actual transfer syntax - if( IsTransferSyntax(key) ) + if ( IsTransferSyntax(key) ) { if ( key == SpecialStrings[JPEGLSLossless] || key == SpecialStrings[JPEGLSNearLossless] ) @@ -273,6 +287,30 @@ bool TS::IsJPEGLS(TSKey const &key) return r; } +/** + * \brief Determines if the Transfer Syntax corresponds to any form + * of MPEG encoded Pixel data. + * @return True when any form of MPEG found. False otherwise. + */ +bool TS::IsMPEG(TSKey const &key) +{ + bool r = false; + // First check this is an actual transfer syntax + if ( IsTransferSyntax(key) ) + { + if ( key == SpecialStrings[MPEG2MainProfile] ) + { + r = true; + } + } + return r; +} + +/** + * \brief GetSpecialTransferSyntax ?? + * @param key TSKey const &key ?? + * @return TS::SpecialType ??. + */ TS::SpecialType TS::GetSpecialTransferSyntax(TSKey const &key) { for (int i = 0; SpecialStrings[i] != NULL; i++) @@ -282,10 +320,14 @@ TS::SpecialType TS::GetSpecialTransferSyntax(TSKey const &key) return SpecialType(i); } } - return UnknownTS; } +/** + * \brief GetSpecialTransferSyntax ?? + * @param t SpecialType t ?? + * @return char* TS : SpecialStrings[t] ??. + */ const char* TS::GetSpecialTransferSyntax(SpecialType t) { return SpecialStrings[t];