X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmVR.cxx;h=28bc8f5127f5c50d5db4462954ef61ea5fa41cbb;hb=df832cf7f90b4ca5aca2f628c1756fb276779fac;hp=8a716da72856592bee508010148f884297ae8e92;hpb=327dfe7647e3720b0f3125f9b19397cb9afc0ed3;p=gdcm.git diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx index 8a716da7..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: 2005/01/06 20:03:28 $ - Version: $Revision: 1.27 $ + 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,11 +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 */ @@ -35,9 +41,9 @@ VR::VR() { std::string filename = DictSet::BuildDictPath() + DICT_VR; std::ifstream from(filename.c_str()); - if(!from) + if ( !from ) { - dbg.Verbose(2, "VR::VR: can't open dictionary", filename.c_str()); + gdcmWarningMacro("Can't open dictionary " << filename.c_str()); FillDefaultVRDict(vr); } else @@ -50,6 +56,9 @@ VR::VR() { from >> std::ws; from.getline(buff, 1024, ' '); + if( strcmp(buff,"") == 0) + continue; + key = buff; from >> std::ws; from.getline(buff, 1024, ';'); @@ -58,16 +67,12 @@ VR::VR() from >> std::ws; from.getline(buff, 1024, '\n'); - if(key != "") - { - vr[key] = name; - } + vr[key] = name; } from.close(); } } -//----------------------------------------------------------------------------- /** * \brief Destructor */ @@ -76,48 +81,16 @@ 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 . + * \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::IsVROfBinaryRepresentable(VRKey const &tested) { - //std::cout << "VR::IsVROfGdcmBinaryRepresentable====================" - // << tested << std::endl; - - if ( tested == GDCM_UNKNOWN) - return true; - if ( IsVROfStringRepresentable(tested) ) return false; @@ -128,10 +101,10 @@ bool VR::IsVROfBinaryRepresentable(VRKey const &tested) } /** - * \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::IsVROfStringRepresentable(VRKey const &tested) { @@ -140,6 +113,8 @@ bool VR::IsVROfStringRepresentable(VRKey const &tested) tested == "CS" || tested == "DA" || tested == "DS" || + tested == "FL" || + tested == "FD" || tested == "IS" || tested == "LO" || tested == "LT" || @@ -151,24 +126,81 @@ bool VR::IsVROfStringRepresentable(VRKey const &tested) tested == "TM" || tested == "UI" || tested == "UL" || - tested == "UN" || - tested == "US"; + 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 Simple predicate that checks wether the given argument - * corresponds to the Value Representation of a \ref SeqEntry - * @param tested value representation to check for. - */ -bool VR::IsVROfSequence(VRKey const &tested) +/// \brief returns the length of a elementary elem whose VR is passed +unsigned short VR::GetAtomicElementLength(VRKey const &tested) { - return tested == "SQ"; + // 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; } +// 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()); + 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