Program: gdcm
Module: $RCSfile: gdcmDictSet.cxx,v $
Language: C++
- Date: $Date: 2004/10/18 02:31:58 $
- Version: $Revision: 1.40 $
+ Date: $Date: 2004/10/28 19:53:29 $
+ Version: $Revision: 1.44 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
Dicts.clear();
// Remove virtual dictionnary entries
- std::map<std::string,DictEntry *>::iterator it;
- for(it = VirtualEntry.begin(); it != VirtualEntry.end(); ++it)
- {
- DictEntry *entry = it->second;
- if ( entry )
- {
- delete entry;
- }
- it->second = NULL;
- }
+ VirtualEntry.clear();
}
//-----------------------------------------------------------------------------
* \ingroup DictSet
* \brief Loads a dictionary from a specified file, and add it
* to already the existing ones contained in this DictSet.
- * @param fileName Absolute or relative filename containing the
+ * @param filename Absolute or relative filename containing the
* dictionary to load.
* @param name Symbolic name that be used as identifier of the newly
* created dictionary.
TagName fourth,
TagName name)
{
- DictEntry* entry;
+ DictEntry *entry;
const std::string tag = DictEntry::TranslateToKey(group,element)
+ "#" + vr + "#" + fourth + "#" + name;
- std::map<std::string,DictEntry *>::iterator it;
+ TagKeyHT::iterator it;
it = VirtualEntry.find(tag);
if(it != VirtualEntry.end())
{
- entry = it->second;
+ entry = &(it->second);
}
else
{
- entry = new DictEntry(group, element, vr, fourth, name);
- VirtualEntry[tag] = entry;
+ DictEntry ent(group, element, vr, fourth, name);
+ VirtualEntry.insert(
+ std::map<TagKey, DictEntry>::value_type
+ (tag, ent));
+ entry = &(VirtualEntry.find(tag)->second);
}
return entry;
{
Dicts[name] = newDict;
- return true; //FIXME
+ return true;
}
//-----------------------------------------------------------------------------