Program: gdcm
Module: $RCSfile: gdcmDictSet.cxx,v $
Language: C++
- Date: $Date: 2005/07/11 14:53:16 $
- Version: $Revision: 1.66 $
+ Date: $Date: 2005/10/18 12:58:27 $
+ Version: $Revision: 1.69 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
*/
DictEntry *DictSet::NewVirtualDictEntry( uint16_t group,
uint16_t elem,
- TagName vr,
- TagName vm,
- TagName name)
+ const VRKey &vr,
+ const TagName &vm,
+ const TagName &name)
{
DictEntry *entry;
//
// const std::string tag = DictEntry::TranslateToKey(group,elem)
// + "#" + vr + "#" + vm + "#" + name;
+#if FASTTAGKEY && 0
+ // FIXME
+ TagKey tag;
+ tag.tab[0] = group;
+ tag.tab[1] = elem;
+#else
char res[10];
sprintf(res,"%04x|%04x", group, elem);
- TagKey tag = res;
- tag += "#" + vr + "#" + vm + "#" + name;
-
- TagKeyHT::iterator it;
+ ExtendedTagKey tag = res;
+ tag += "#" + vr.str() + "#" + vm + "#" + name;
+#endif
+
+ ExtendedTagKeyHT::iterator it;
it = VirtualEntries.find(tag);
if ( it != VirtualEntries.end() )
{
DictEntry ent(group, elem, vr, vm, name);
VirtualEntries.insert(
- std::map<TagKey, DictEntry>::value_type(tag, ent) );
+ ExtendedTagKeyHT::value_type(tag, ent) );
entry = &(VirtualEntries.find(tag)->second);
}