X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDict.cxx;h=19b9363999d81d478884c554acff33f6c60dc107;hb=57514b6da5b0ee3a9a1c37a15ccde6f5e1ae1688;hp=bb6bd72eb67de471d3eee997c81c126abf696737;hpb=1d69b92978803204089d270599133917d944c651;p=gdcm.git diff --git a/src/gdcmDict.cxx b/src/gdcmDict.cxx index bb6bd72e..19b93639 100644 --- a/src/gdcmDict.cxx +++ b/src/gdcmDict.cxx @@ -3,8 +3,8 @@ 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 @@ -23,9 +23,10 @@ #include #include #include + namespace gdcm { - +void FillDefaultDataDict(Dict *d); //----------------------------------------------------------------------------- // Constructor / Destructor /** @@ -41,26 +42,31 @@ Dict::Dict(std::string const & filename) 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; } /** @@ -68,14 +74,6 @@ Dict::Dict(std::string const & 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. @@ -108,12 +106,12 @@ void Dict::PrintByKey(std::ostream &os) 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(); } @@ -132,11 +130,11 @@ void Dict::PrintByName(std::ostream& os) 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(); @@ -150,9 +148,9 @@ void Dict::PrintByName(std::ostream& os) * @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) { @@ -161,8 +159,8 @@ bool Dict::AddNewEntry(DictEntry *newEntry) } 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; } } @@ -173,12 +171,12 @@ bool Dict::AddNewEntry(DictEntry *newEntry) * @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; @@ -191,19 +189,15 @@ bool Dict::ReplaceEntry(DictEntry *newEntry) * @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 @@ -229,17 +223,18 @@ bool Dict::RemoveEntry (uint16_t group, uint16_t element) * \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); } /** @@ -251,11 +246,12 @@ DictEntry* Dict::GetDictEntryByName(TagName name) 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); } /** @@ -264,12 +260,12 @@ DictEntry* Dict::GetDictEntryByNumber(uint16_t group, uint16_t element) * \sa DictSet::GetPubDictTagNamesByCategory * @return A list of all entries of the public dicom dictionnary. */ -std::list* Dict::GetDictEntryNames() +EntryNamesList* Dict::GetDictEntryNames() { - std::list *result = new std::list; + 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; } @@ -298,13 +294,13 @@ std::list* Dict::GetDictEntryNames() * corresponding values are lists of all the dictionnary entries * among that group. */ -std::map > *Dict::GetDictEntryNamesByCategory(void) +EntryNamesByCatMap *Dict::GetDictEntryNamesByCategory() { - std::map > *result = new std::map >; + 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;