X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmTS.cxx;h=348f7e003c496a68942de9b0b5261eeb1fa3afc0;hb=016aa39f27667edc2756025e2630b09f229664fc;hp=d898be757f614464e4b407020a0f78eb2f1ce045;hpb=abd6bfcc2b10b5f7447d1758938d7c15c31240af;p=gdcm.git diff --git a/src/gdcmTS.cxx b/src/gdcmTS.cxx index d898be75..348f7e00 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/01/07 19:20:39 $ - Version: $Revision: 1.32 $ + Date: $Date: 2005/01/23 10:12:34 $ + Version: $Revision: 1.38 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -33,6 +33,46 @@ namespace gdcm { +//----------------------------------------------------------------------------- +static const char *SpecialStrings[] = { + // Implicit VR Little Endian + "1.2.840.10008.1.2", + // Implicit VR Big Endian DLX (G.E Private) + "1.2.840.113619.5.2", + // Explicit VR Little Endian + "1.2.840.10008.1.2.1", + // Deflated Explicit VR Little Endian + "1.2.840.10008.1.2.1.99", + // Explicit VR Big Endian + "1.2.840.10008.1.2.2", + // JPEG Baseline (Process 1) + "1.2.840.10008.1.2.4.50", + // JPEG Extended (Process 2 & 4) + "1.2.840.10008.1.2.4.51", + // JPEG Extended (Process 3 & 5) + "1.2.840.10008.1.2.4.52", + // JPEG Spectral Selection, Non-Hierarchical (Process 6 & 8) + "1.2.840.10008.1.2.4.53", + // JPEG Full Progression, Non-Hierarchical (Process 10 & 12) + "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]) + "1.2.840.10008.1.2.4.70", + // JPEG-LS Lossless Image Compression + "1.2.840.10008.1.2.4.80", + // JPEG-LS Lossy (Near-Lossless) Image Compression + "1.2.840.10008.1.2.4.81", + // JPEG 2000 Lossless + "1.2.840.10008.1.2.4.90", + // JPEG 2000 + "1.2.840.10008.1.2.4.91", + // RLE Lossless + "1.2.840.10008.1.2.5", + // Unknown + "Unknown Transfer Syntax" +}; + void FillDefaultTSDict(TSHT &ts); //----------------------------------------------------------------------------- // Constructor / Destructor @@ -42,20 +82,20 @@ TS::TS() std::ifstream from(filename.c_str()); if( !from ) { - gdcmVerboseMacro("TS::TS: can't open dictionary" << filename.c_str()); + gdcmVerboseMacro("Can't open dictionary" << filename.c_str()); FillDefaultTSDict( TsMap ); } else { TSKey key; TSAtr name; - + while (!from.eof()) { from >> key; from >> std::ws; std::getline(from, name); - + if(key != "") { TsMap[key] = name; @@ -74,7 +114,6 @@ TS::~TS() //----------------------------------------------------------------------------- // Print /** - * \ingroup VR * \brief Print all * @param os The output stream to be written to. */ @@ -98,13 +137,175 @@ int TS::Count(TSKey const &key) TSAtr const & TS::GetValue(TSKey const &key) { - TSHT::const_iterator it = TsMap.find(key); + // First thing clean up the string sometime the transfer syntax is padded with spaces + std::string copy = key; + while ( copy.size() && !isdigit((unsigned char)copy[copy.size()-1]) ) + { + copy.erase(copy.size()-1, 1); + } + + TSHT::const_iterator it = TsMap.find(copy); if (it == TsMap.end()) { return GDCM_UNFOUND; } return it->second; } +/** + * \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. + */ +bool TS::IsTransferSyntax(TSKey const &key) +{ + TSHT::const_iterator it = TsMap.find(key); + return it != TsMap.end(); +} + +/** + * \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. + */ +bool TS::IsRLELossless(TSKey const &key) +{ + bool r = false; + // First check this is an actual transfer syntax + if( IsTransferSyntax(key) ) + { + if ( key == SpecialStrings[RLELossless] ) + { + r = true; + } + } + return r; +} + +/** + * \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. + */ +bool TS::IsJPEGLossless(TSKey const &key) +{ + bool r = false; + // First check this is an actual transfer syntax + if( IsTransferSyntax(key) ) + { + if ( key == SpecialStrings[JPEGFullProgressionProcess10_12] + || key == SpecialStrings[JPEGLosslessProcess14] + || key == SpecialStrings[JPEGLosslessProcess14_1] ) + { + r = true; + } + } + return r; +} + +/** + * \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. + */ +bool TS::IsJPEGLossy(TSKey const &key) +{ + bool r = false; + // First check this is an actual transfer syntax + if( IsTransferSyntax(key) ) + { + if ( key == SpecialStrings[JPEGBaselineProcess1] + || key == SpecialStrings[JPEGExtendedProcess2_4] + || key == SpecialStrings[JPEGExtendedProcess3_5] + || key == SpecialStrings[JPEGSpectralSelectionProcess6_8] ) + { + r = true; + } + } + 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. + */ +bool TS::IsJPEG2000(TSKey const &key) +{ + bool r = false; + // First check this is an actual transfer syntax + if( IsTransferSyntax(key) ) + { + if ( key == SpecialStrings[JPEG2000Lossless] + || key == SpecialStrings[JPEG2000] ) + { + r = true; + } + } + return r; +} + +/** + * \brief Determines if the Transfer Syntax corresponds to + * 'classical' Jpeg Lossless or Jpeg lossy. + * @return True when any form of JPEG found. False otherwise. + */ +bool TS::IsJPEG(TSKey const &key) +{ + bool r = false; + // First check this is an actual transfer syntax + if( IsTransferSyntax(key) ) + { + if ( IsJPEGLossy( key ) + || IsJPEGLossless( key ) + ) + { + r = true; + } + } + return r; +} + +/** + * \brief Determines if the Transfer Syntax corresponds to any form + * of Jpeg-LS encoded Pixel data. + * @return True when any form of JPEG-LS found. False otherwise. + */ +bool TS::IsJPEGLS(TSKey const &key) +{ + bool r = false; + // First check this is an actual transfer syntax + if( IsTransferSyntax(key) ) + { + if ( key == SpecialStrings[JPEGLSLossless] + || key == SpecialStrings[JPEGLSNearLossless] ) + { + r = true; + } + } + return r; +} + +TS::SpecialType TS::GetSpecialTransferSyntax(TSKey const &key) +{ + for (int i = 0; SpecialStrings[i] != NULL; i++) + { + if ( SpecialStrings[i] == key ) + { + return SpecialType(i); + } + } + + return UnknownTS; +} + +const char* TS::GetSpecialTransferSyntax(SpecialType t) +{ + return SpecialStrings[t]; +} //----------------------------------------------------------------------------- // Protected