Program: gdcm
Module: $RCSfile: gdcmDictSet.cxx,v $
Language: C++
- Date: $Date: 2004/10/12 04:35:45 $
- Version: $Revision: 1.38 $
+ 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
#include "gdcmDebug.h"
#include <fstream>
#include <stdlib.h> // For getenv
+
namespace gdcm
{
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();
}
//-----------------------------------------------------------------------------
* \sa DictSet::GetPubDictTagNamesByCategory
* @return A list of all entries of the public dicom dictionnary.
*/
-std::list<std::string> *DictSet::GetPubDictEntryNames()
+EntryNamesList * DictSet::GetPubDictEntryNames()
{
return GetDefaultPubDict()->GetDictEntryNames();
}
* corresponding values are lists of all the dictionnary entries
* among that group.
*/
-std::map<std::string, std::list<std::string> > *
- DictSet::GetPubDictEntryNamesByCategory()
+EntryNamesByCatMap * DictSet::GetPubDictEntryNamesByCategory()
{
return GetDefaultPubDict()->GetDictEntryNamesByCategory();
}
* \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.
*/
-Dict *DictSet::LoadDictFromFile(std::string const & fileName,
- DictKey const & name)
+Dict *DictSet::LoadDictFromFile(std::string const & filename,
+ DictKey const & name)
{
- Dict *newDict = new Dict(fileName);
+ Dict *newDict = new Dict(filename);
AppendDict(newDict, name);
return newDict;
* in no dictionnary
* @return virtual entry
*/
-DictEntry *DictSet::NewVirtualDictEntry(uint16_t group,
- uint16_t element,
- std::string vr,
- std::string fourth,
- std::string name)
+DictEntry *DictSet::NewVirtualDictEntry( uint16_t group,
+ uint16_t element,
+ TagName vr,
+ 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;
}
//-----------------------------------------------------------------------------