Program: gdcm
Module: $RCSfile: gdcmDict.cxx,v $
Language: C++
- Date: $Date: 2004/10/12 04:35:45 $
- Version: $Revision: 1.45 $
+ Date: $Date: 2004/11/16 02:54:35 $
+ Version: $Revision: 1.52 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <fstream>
#include <iostream>
#include <iomanip>
+
namespace gdcm
{
-
+void FillDefaultDataDict(Dict *d);
//-----------------------------------------------------------------------------
// Constructor / Destructor
/**
TagName name;
std::ifstream from( filename.c_str() );
- dbg.Error(!from, "Dict::Dict: can't open dictionary",
- filename.c_str());
-
- while (!from.eof())
+ if( !from )
+ {
+ dbg.Verbose(2,"Dict::Dict: can't open dictionary", filename.c_str());
+ // Using default embeded one:
+ FillDefaultDataDict( this );
+ }
+ else
{
- from >> std::hex;
- from >> group; /// MEMORY LEAK in std::istream::operator>>
- from >> element;
- from >> vr;
- from >> fourth;
- from >> std::ws; // used to be eatwhite(from);
- std::getline(from, name); /// MEMORY LEAK in std::getline<>
+ while (!from.eof())
+ {
+ from >> std::hex;
+ from >> group;
+ from >> element;
+ from >> vr;
+ from >> fourth;
+ from >> std::ws; //remove white space
+ std::getline(from, name);
+
+ const DictEntry newEntry(group, element, vr, fourth, name);
+ AddNewEntry(newEntry);
+ }
- DictEntry * newEntry = new DictEntry(group, element,
- vr, fourth, name);
- AddNewEntry(newEntry);
+ Filename = filename;
}
from.close();
-
- Filename = filename;
}
/**
*/
Dict::~Dict()
{
- for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag)
- {
- DictEntry* entryToDelete = tag->second;
- if ( entryToDelete )
- {
- delete entryToDelete;
- }
- }
// Since AddNewEntry adds symetrical in both KeyHt and NameHT we can
// assume all the pointed DictEntries are already cleaned-up when
// we cleaned KeyHt.
for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag)
{
s << "Entry : ";
- s << "(" << std::hex << std::setw(4) << tag->second->GetGroup() << ',';
- s << std::hex << std::setw(4) << tag->second->GetElement() << ") = "
+ s << "(" << std::hex << std::setw(4) << tag->second.GetGroup() << ',';
+ s << std::hex << std::setw(4) << tag->second.GetElement() << ") = "
<< std::dec;
- s << tag->second->GetVR() << ", ";
- s << tag->second->GetFourth() << ", ";
- s << tag->second->GetName() << "." << std::endl;
+ s << tag->second.GetVR() << ", ";
+ s << tag->second.GetFourth() << ", ";
+ s << tag->second.GetName() << "." << std::endl;
}
os << s.str();
}
for (TagNameHT::iterator tag = NameHt.begin(); tag != NameHt.end(); ++tag)
{
s << "Entry : ";
- s << tag->second->GetName() << ",";
- s << tag->second->GetVR() << ", ";
- s << tag->second->GetFourth() << ", ";
- s << "(" << std::hex << std::setw(4) << tag->second->GetGroup() << ',';
- s << std::hex << std::setw(4) << tag->second->GetElement() << ") = ";
+ s << tag->second.GetName() << ",";
+ s << tag->second.GetVR() << ", ";
+ s << tag->second.GetFourth() << ", ";
+ s << "(" << std::hex << std::setw(4) << tag->second.GetGroup() << ',';
+ s << std::hex << std::setw(4) << tag->second.GetElement() << ") = ";
s << std::dec << std::endl;
}
os << s.str();
* @param newEntry entry to add
* @return false if Dicom Element already exists
*/
-bool Dict::AddNewEntry(DictEntry *newEntry)
+bool Dict::AddNewEntry(DictEntry const & newEntry)
{
- TagKey key = newEntry->GetKey();
+ const TagKey & key = newEntry.GetKey();
if(KeyHt.count(key) == 1)
{
}
else
{
- KeyHt[newEntry->GetKey()] = newEntry;
- NameHt[newEntry->GetName()] = newEntry;
+ KeyHt.insert( TagKeyHT::value_type(newEntry.GetKey(), newEntry));
+ NameHt.insert( TagNameHT::value_type(newEntry.GetName(), newEntry ));
return true;
}
}
* @param newEntry new entry (overwrites any previous one with same tag)
* @return false if Dicom Element doesn't exist
*/
-bool Dict::ReplaceEntry(DictEntry *newEntry)
+bool Dict::ReplaceEntry(DictEntry const & newEntry)
{
- if ( RemoveEntry(newEntry->DictEntry::GetKey()) )
+ if ( RemoveEntry(newEntry.GetKey()) )
{
- KeyHt[newEntry->GetKey()] = newEntry;
- NameHt[newEntry->GetName()] = newEntry;
+ KeyHt.insert( TagKeyHT::value_type(newEntry.GetKey(), newEntry));
+ NameHt.insert( TagNameHT::value_type(newEntry.GetName(), newEntry ));
return true;
}
return false;
* @param key (group|element)
* @return false if Dicom Dictionary Entry doesn't exist
*/
-bool Dict::RemoveEntry(TagKey key)
+bool Dict::RemoveEntry (TagKey const & key)
{
- if(KeyHt.count(key) == 1)
+ TagKeyHT::const_iterator it = KeyHt.find(key);
+ if(it != KeyHt.end())
{
- DictEntry* entryToDelete = KeyHt.find(key)->second;
-
- if ( entryToDelete )
- {
- NameHt.erase(entryToDelete->GetName());
- delete entryToDelete;
- }
-
+ const DictEntry& entryToDelete = it->second;
+ NameHt.erase(entryToDelete.GetName());
KeyHt.erase(key);
+
return true;
}
else
* \brief Get the dictionnary entry identified by it's name.
* @param name element of the ElVal to modify
* \warning : NEVER use it !
- * the 'name' IS NOT an identifier within the Dicom Dicom Dictionary
+ * the 'name' IS NOT an identifier within the Dicom Dictionary
* the name MAY CHANGE between two versions !
* @return the corresponding dictionnary entry when existing, NULL otherwise
*/
-DictEntry* Dict::GetDictEntryByName(TagName name)
+DictEntry* Dict::GetDictEntryByName(TagName const & name)
{
- if ( !NameHt.count(name))
+ TagNameHT::iterator it = NameHt.find(name);
+ if ( it == NameHt.end() )
{
return 0;
}
- return NameHt.find(name)->second;
+ return &(it->second);
}
/**
DictEntry* Dict::GetDictEntryByNumber(uint16_t group, uint16_t element)
{
TagKey key = DictEntry::TranslateToKey(group, element);
- if ( !KeyHt.count(key) )
+ TagKeyHT::iterator it = KeyHt.find(key);
+ if ( it == KeyHt.end() )
{
return 0;
}
- return KeyHt.find(key)->second;
+ return &(it->second);
}
/**
* \sa DictSet::GetPubDictTagNamesByCategory
* @return A list of all entries of the public dicom dictionnary.
*/
-std::list<std::string>* Dict::GetDictEntryNames()
+EntryNamesList* Dict::GetDictEntryNames()
{
- std::list<std::string> *result = new std::list<std::string>;
+ EntryNamesList *result = new EntryNamesList;
for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag)
{
- result->push_back( tag->second->GetName() );
+ result->push_back( tag->second.GetName() );
}
return result;
}
* corresponding values are lists of all the dictionnary entries
* among that group.
*/
-std::map<std::string, std::list<std::string> > *Dict::GetDictEntryNamesByCategory(void)
+EntryNamesByCatMap *Dict::GetDictEntryNamesByCategory()
{
- std::map<std::string, std::list<std::string> > *result = new std::map<std::string, std::list<std::string> >;
+ EntryNamesByCatMap *result = new EntryNamesByCatMap;
for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag)
{
- (*result)[tag->second->GetFourth()].push_back(tag->second->GetName());
+ (*result)[tag->second.GetFourth()].push_back(tag->second.GetName());
}
return result;