X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmVR.cxx;h=28bc8f5127f5c50d5db4462954ef61ea5fa41cbb;hb=713d0f3d28a6176fab6d57e031633061dc7354a7;hp=12d8a5cbae306d4915e9de5814d735237f60613f;hpb=0287dd00505798c37e7fe9c31a4923151fb658eb;p=gdcm.git diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx index 12d8a5cb..28bc8f51 100644 --- a/src/gdcmVR.cxx +++ b/src/gdcmVR.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmVR.cxx,v $ Language: C++ - Date: $Date: 2004/10/27 21:28:56 $ - Version: $Revision: 1.20 $ + Date: $Date: 2007/09/25 15:21:57 $ + Version: $Revision: 1.62 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -23,10 +23,17 @@ #include #include +#include -namespace gdcm +namespace GDCM_NAME_SPACE { //----------------------------------------------------------------------------- +/// \brief auto generated function, to fill up the 'Value Representation' +/// Dictionnary, if relevant file is not found on user's disk +void FillDefaultVRDict(VRHT &vr); + +//----------------------------------------------------------------------------- +// Constructor / Destructor /** * \brief Constructor */ @@ -34,33 +41,38 @@ VR::VR() { std::string filename = DictSet::BuildDictPath() + DICT_VR; std::ifstream from(filename.c_str()); - dbg.Error(!from, "VR::VR: can't open dictionary", filename.c_str()); - - char buff[1024]; - VRKey key; - VRAtr name; - - while (!from.eof()) + if ( !from ) { - from >> std::ws; - from.getline(buff, 1024, ' '); - key = buff; - from >> std::ws; - from.getline(buff, 1024, ';'); - name = buff; - - from >> std::ws; - from.getline(buff, 1024, '\n'); - - if(key != "") + gdcmWarningMacro("Can't open dictionary " << filename.c_str()); + FillDefaultVRDict(vr); + } + else + { + char buff[1024]; + VRKey key; + VRAtr name; + + while (!from.eof()) { - vr[key]=name; + from >> std::ws; + from.getline(buff, 1024, ' '); + if( strcmp(buff,"") == 0) + continue; + + key = buff; + from >> std::ws; + from.getline(buff, 1024, ';'); + name = buff; + + from >> std::ws; + from.getline(buff, 1024, '\n'); + + vr[key] = name; } + from.close(); } - from.close(); } -//----------------------------------------------------------------------------- /** * \brief Destructor */ @@ -69,91 +81,126 @@ VR::~VR() vr.clear(); } -//----------------------------------------------------------------------------- -// Print -/** - * \brief Print all - * @param os The output stream to be written to. - */ -void VR::Print(std::ostream &os) -{ - std::ostringstream s; - - for (VRHT::iterator it = vr.begin(); it != vr.end(); ++it) - { - s << "VR : " << it->first << " = " << it->second << std::endl; - } - os << s.str(); -} - //----------------------------------------------------------------------------- // Public -/** - * \brief Get the count for an element - * @param key key to count - */ -int VR::Count(VRKey const & key) -{ - return vr.count(key); -} -//----------------------------------------------------------------------------- /** - * \brief Simple predicate that checks wether the given argument - * corresponds to the Value Representation of a \ref BinEntry . - * This predicate is the negation of - * \ref VR::IsVROfGdcmStringRepresentable . + * \brief Simple predicate that checks whether the given argument + * corresponds to the Value Representation of a DataEntry . * @param tested value representation to check for. */ -bool VR::IsVROfGdcmBinaryRepresentable(VRKey const & tested) +bool VR::IsVROfBinaryRepresentable(VRKey const &tested) { - //std::cout << "VR::IsVROfGdcmBinaryRepresentable====================" - // << tested << std::endl; - - if ( tested == "unkn") - return true; - - if ( ! Count(tested) ) - { - dbg.Verbose(0, "VR::IsVROfGdcmBinaryRepresentable: tested not a VR!"); + if ( IsVROfStringRepresentable(tested) ) return false; - } - if ( IsVROfGdcmStringRepresentable(tested) ) - { - dbg.Verbose(0, "VR::IsVROfGdcmBinaryRepresentable: binary VR !"); + if ( IsVROfSequence(tested) ) return false; - } return true; } -//----------------------------------------------------------------------------- /** - * \brief Simple predicate that checks wether the given argument - * corresponds to the Value Representation of a \ref ValEntry - * but NOT a \ref BinEntry. - * @param tested value representation to check for. + * \brief Simple predicate that checks whether the given argument + * corresponds to the Value Representation of a + * 'std::string representable' value. + * @param tested value representation to be checked. */ -bool VR::IsVROfGdcmStringRepresentable(VRKey const & tested) +bool VR::IsVROfStringRepresentable(VRKey const &tested) { + return tested == "AE" || + tested == "AS" || + tested == "CS" || + tested == "DA" || + tested == "DS" || + tested == "FL" || + tested == "FD" || + tested == "IS" || + tested == "LO" || + tested == "LT" || + tested == "PN" || + tested == "SH" || + tested == "SL" || + tested == "SS" || + tested == "ST" || + tested == "TM" || + tested == "UI" || + tested == "UL" || + tested == "US" || + tested == "UT"; + + // Should be quicker + // --> will *never* work : any rotten value would be considered as OK ! +/* + return tested != "OB" && + tested != "OW" && + tested != "OF" && + tested != "AT" && // Attribute Tag ?!? contain no printable character + tested != "UN" && // UN is an actual VR ! + tested != "SQ" ; +*/ +} +/// \brief returns the length of a elementary elem whose VR is passed +unsigned short VR::GetAtomicElementLength(VRKey const &tested) +{ + // Unsigned & signed short + if( tested == "US" || tested == "SS" ) + return 2; + // Unsigned & signed long + if( tested == "UL" || tested == "SL" ) + return 4; + // Float + if( tested == "FL" ) + return 4; + // Double + if( tested == "FD" ) + return 8; + // Word string + if( tested == "OW" ) + return 2; + // Float string + if( tested == "OF" || tested == "OL") + return 4; + return 1; +} - if ( ! Count(tested) ) - { - dbg.Verbose(0, "VR::IsVROfGdcmStringRepresentable: tested not a VR!"); - return false; - } +// VS6 need a single implementation in the dll +#if defined(_MSC_VER) && (_MSC_VER == 1200) +/// \brief checks is a supposed-to-be VR is a 'legal' one. +bool VR::IsValidVR(VRKey const &key) +{ + return vr.find(key) != vr.end(); +#ifdef USECOMPLETELYUNTESTEDCODE + // to avoid to search in a std::map of std::string, + // since each std::string is 2 characters longs, we check the array + // (29 char comparisons in the worst case!) + + // "RT" is an undocumented VR, found in some Siemens images. + // We added it here to be able to read these images. + // Dict/gdcmVR.dic, Document has to be updated, too. + static const char VRvalues[] = + "AEASATCSDADSDTFLFDISLOLTOBOWOLOFPNSHSLSQSSSTTMUIULUNUSUTRT"; + + //int nbVal = strlen(VRvalues)/2; // save CPU time. + int nbVal = 29; + + const char *pt = VRvalues; + for (int i=0;ifirst << " = " << it->second << std::endl; + } +} +//----------------------------------------------------------------------------- } // end namespace gdcm