X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmVR.cxx;h=ded62a4a6172c9511246f184b8b8780fcb607ac3;hb=76ac46b16fd92d0fb444f786d4946424d9029315;hp=802557d1f25b4e2d10bb9056722773c08487b48a;hpb=541ed5b2824ff14630565a474b1406e58b677662;p=gdcm.git diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx index 802557d1..ded62a4a 100644 --- a/src/gdcmVR.cxx +++ b/src/gdcmVR.cxx @@ -1,47 +1,227 @@ -// gdcmVR.cxx +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmVR.cxx,v $ + Language: C++ + Date: $Date: 2008/02/13 11:42:13 $ + Version: $Revision: 1.63 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ #include "gdcmVR.h" #include "gdcmUtil.h" +#include "gdcmDictSet.h" +#include "gdcmDebug.h" -gdcmVR::gdcmVR () { - // NOTE: making the affectation directely to dicom_vr instead of passing - // through an apparently unncessary local variable vr, crashes with - // gcc... Beware. - VRHT *vr = new VRHT; - (*vr)["AE"] = "Application Entity"; // At most 16 bytes - (*vr)["AS"] = "Age String"; // Exactly 4 bytes - (*vr)["AT"] = "Attribute Tag"; // 2 16-bit unsigned short integers - (*vr)["CS"] = "Code String"; // At most 16 bytes - (*vr)["DA"] = "Date"; // Exactly 8 bytes - (*vr)["DS"] = "Decimal String"; // At most 16 bytes - (*vr)["DT"] = "Date Time"; // At most 26 bytes - (*vr)["FL"] = "Floating Point Single"; // 32-bit IEEE 754:1985 float - (*vr)["FD"] = "Floating Point Double"; // 64-bit IEEE 754:1985 double - (*vr)["IS"] = "Integer String"; // At most 12 bytes - (*vr)["LO"] = "Long String"; // At most 64 chars - (*vr)["LT"] = "Long Text"; // At most 10240 chars - (*vr)["OB"] = "Other Byte String"; // String of bytes (vr independant) - (*vr)["OW"] = "Other Word String"; // String of 16-bit words (vr dep) - (*vr)["PN"] = "Person Name"; // At most 64 chars - (*vr)["SH"] = "Short String"; // At most 16 chars - (*vr)["SL"] = "Signed Long"; // Exactly 4 bytes - (*vr)["SQ"] = "Sequence of Items"; // Not Applicable - (*vr)["SS"] = "Signed Short"; // Exactly 2 bytes - (*vr)["ST"] = "Short Text"; // At most 1024 chars - (*vr)["TM"] = "Time"; // At most 16 bytes - (*vr)["UI"] = "Unique Identifier"; // At most 64 bytes - (*vr)["UL"] = "Unsigned Long "; // Exactly 4 bytes - (*vr)["UN"] = "Unknown"; // Any length of bytes - (*vr)["US"] = "Unsigned Short "; // Exactly 2 bytes - (*vr)["UT"] = "Unlimited Text"; // At most 2^32 -1 chars - dicom_vr = vr; +#include +#include +#include + +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 + */ +VR::VR() +{ + std::string filename = DictSet::BuildDictPath() + DICT_VR; + std::ifstream from(filename.c_str()); + if ( !from ) + { + gdcmWarningMacro("Can't open dictionary " << filename.c_str()); + FillDefaultVRDict(vr); + } + else + { + char buff[1024]; + VRKey key; + VRAtr name; + + while (!from.eof()) + { + 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(); + } +} + +/** + * \brief Destructor + */ +VR::~VR() +{ + vr.clear(); } -gdcmVR::~gdcmVR() { - dicom_vr->clear(); - delete dicom_vr; +//----------------------------------------------------------------------------- +// Public + +/** + * \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) +{ + if ( IsVROfStringRepresentable(tested) ) + return false; + + if ( IsVROfSequence(tested) ) + return false; + + return true; } -int gdcmVR::Count(VRKey key) { - return dicom_vr->count(key); +/** + * \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) +{ + return tested == "AE" || + tested == "AS" || + tested == "CS" || + tested == "DA" || + tested == "DS" || + tested == "DT" || + 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; } + +// 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