X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictEntry.cxx;h=3e88c55f0a4f9728c6c8e7831abe734b7f4e18b3;hb=01940747ce53f8c87bc883c47fd152e787e73b07;hp=e8366b249a14629b65a172b1064f0207de5cadad;hpb=ff8631dd8488e6604df635faf472ee85f5b8a4b6;p=gdcm.git diff --git a/src/gdcmDictEntry.cxx b/src/gdcmDictEntry.cxx index e8366b24..3e88c55f 100644 --- a/src/gdcmDictEntry.cxx +++ b/src/gdcmDictEntry.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDictEntry.cxx,v $ Language: C++ - Date: $Date: 2005/02/02 15:07:41 $ - Version: $Revision: 1.45 $ + Date: $Date: 2005/07/11 15:20:46 $ + Version: $Revision: 1.51 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -22,6 +22,7 @@ #include // for std::ios::left, ... #include +#include // for sprintf namespace gdcm { @@ -32,8 +33,8 @@ namespace gdcm * @param group DICOM-Group Number * @param elem DICOM-Element Number * @param vr Value Representation - * @param vm Value Mutlplicity - * @param name description of the element + * @param vm Value Multiplicity + * @param name description of the element */ DictEntry::DictEntry(uint16_t group, uint16_t elem, @@ -94,7 +95,21 @@ void DictEntry::SetVM(TagName const &vm) */ TagKey DictEntry::TranslateToKey(uint16_t group, uint16_t elem) { - return Util::Format("%04x|%04x", group, elem); + // according to 'Purify', TranslateToKey is one of the most + // time consuming methods. + // Let's try to shorten it ! + + //return Util::Format("%04x|%04x", group, elem); // too much time ! +#if FASTTAGKEY + TagKey r; + r.tab[0] = group; + r.tab[1] = elem; + return r; +#else + char res[10]; + sprintf(res,"%04x|%04x", group, elem); + return res; +#endif } //----------------------------------------------------------------------------- @@ -116,13 +131,13 @@ void DictEntry::Print(std::ostream &os, std::string const & ) std::ostringstream s; vr = GetVR(); - if(vr==GDCM_UNKNOWN) + if ( vr==GDCM_UNKNOWN ) vr=" "; s << DictEntry::TranslateToKey(GetGroup(),GetElement()); s << " [" << vr << "] "; - if (PrintLevel >= 1) + if ( PrintLevel >= 1 ) { s.setf(std::ios::left); s << std::setw(66-GetName().length()) << " ";