X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmVR.cxx;h=839e1617096db2da51e5bd36048573b68f9e400a;hb=ecad45b05fa564b6147c6475c5fa7f3b2838c707;hp=57e1ce08d913f7eab8ce5f53a72da6f129ef5079;hpb=2f79ae87219e7b7433eb89f71d2f05a03f60af69;p=gdcm.git diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx index 57e1ce08..839e1617 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/17 11:13:21 $ - Version: $Revision: 1.32 $ + Date: $Date: 2005/10/26 08:04:16 $ + Version: $Revision: 1.47 $ 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 { +//----------------------------------------------------------------------------- +/// \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 ) { - gdcmVerboseMacro("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,45 +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 whether the given argument - * corresponds to the Value Representation of a \ref BinEntry . + * corresponds to the Value Representation of a \ref DataEntry . * @param tested value representation to check for. */ bool VR::IsVROfBinaryRepresentable(VRKey const &tested) { - if ( tested == GDCM_UNKNOWN) - return true; - if ( IsVROfStringRepresentable(tested) ) return false; @@ -126,12 +102,17 @@ bool VR::IsVROfBinaryRepresentable(VRKey const &tested) /** * \brief Simple predicate that checks whether the given argument - * corresponds to the Value Representation of a \ref ValEntry - * but NOT a \ref BinEntry. + * corresponds to the Value Representation of a + * 'std::string representable' value. * @param tested value representation to be checked. */ bool VR::IsVROfStringRepresentable(VRKey const &tested) { + //FIXME : either you consider than US, UL, SS, SL *are* string representable + // and you have to add FD and FL + // or you consider they are not, and you have to remove them + // (I cannot guess your point, reading gdcmDataEntry code :-( ) JPR + return tested == "AE" || tested == "AS" || tested == "CS" || @@ -148,24 +129,49 @@ bool VR::IsVROfStringRepresentable(VRKey const &tested) tested == "TM" || tested == "UI" || tested == "UL" || - tested == "UN" || - tested == "US"; + tested == "US" || + tested == "UT"; + + // Should be quicker --> But it doesn't work : revert to old code +/* + return tested != "FL" && + tested != "FD" && + tested != "OB" && + tested != "OW" && + tested != "AT" && // Attribute Tag ?!? + tested != "UN" && // UN is an actual VR ! + tested != "SQ" ; +*/ } - -/** - * \brief Simple predicate that checks whether 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; + 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(); } +#endif //----------------------------------------------------------------------------- // Protected @@ -174,5 +180,18 @@ bool VR::IsValidVR(VRKey const &key) // Private //----------------------------------------------------------------------------- +// Print +/** + * \brief Print all + * @param os The output stream to be written to. + */ +void VR::Print(std::ostream &os,std::string const &) +{ + for (VRHT::iterator it = vr.begin(); it != vr.end(); ++it) + { + os << "VR : " << it->first << " = " << it->second << std::endl; + } +} +//----------------------------------------------------------------------------- } // end namespace gdcm