X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmDict.cxx;h=a8a80f2b520225d73681f12e9ef5efa9edb6db5c;hb=40b909789581894e57a0d8f22d6f1f91f55e7f84;hp=925451a32d4a68c392686f5c641f551b0541781b;hpb=fd37aa842b5d31ca266b6bda8a77f3201d02338d;p=gdcm.git diff --git a/src/gdcmDict.cxx b/src/gdcmDict.cxx index 925451a3..a8a80f2b 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/09/27 08:39:06 $ - Version: $Revision: 1.43 $ + Date: $Date: 2004/10/18 02:31:58 $ + Version: $Revision: 1.47 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -24,13 +24,16 @@ #include #include +namespace gdcm +{ + //----------------------------------------------------------------------------- // Constructor / Destructor /** * \brief Construtor * @param filename from which to build the dictionary. */ -gdcmDict::gdcmDict(std::string const & filename) +Dict::Dict(std::string const & filename) { uint16_t group; uint16_t element; @@ -39,21 +42,20 @@ gdcmDict::gdcmDict(std::string const & filename) TagName name; std::ifstream from( filename.c_str() ); - dbg.Error(!from, "gdcmDict::gdcmDict: can't open dictionary", + dbg.Error(!from, "Dict::Dict: can't open dictionary", filename.c_str()); while (!from.eof()) { from >> std::hex; - from >> group; /// MEMORY LEAK in std::istream::operator>> + from >> group; from >> element; from >> vr; from >> fourth; - eatwhite(from); - std::getline(from, name); /// MEMORY LEAK in std::getline<> + from >> std::ws; //remove white space + std::getline(from, name); - gdcmDictEntry * newEntry = new gdcmDictEntry(group, element, - vr, fourth, name); + DictEntry * newEntry = new DictEntry(group, element, vr, fourth, name); AddNewEntry(newEntry); } from.close(); @@ -64,18 +66,18 @@ gdcmDict::gdcmDict(std::string const & filename) /** * \brief Destructor */ -gdcmDict::~gdcmDict() +Dict::~Dict() { for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag) { - gdcmDictEntry* entryToDelete = tag->second; + DictEntry* entryToDelete = tag->second; if ( entryToDelete ) { delete entryToDelete; } } // Since AddNewEntry adds symetrical in both KeyHt and NameHT we can - // assume all the pointed gdcmDictEntries are already cleaned-up when + // assume all the pointed DictEntries are already cleaned-up when // we cleaned KeyHt. KeyHt.clear(); NameHt.clear(); @@ -88,7 +90,7 @@ gdcmDict::~gdcmDict() * Entries will be sorted by tag i.e. the couple (group, element). * @param os The output stream to be written to. */ -void gdcmDict::Print(std::ostream &os) +void Dict::Print(std::ostream &os) { os << "Dict file name : " << Filename << std::endl; PrintByKey(os); @@ -99,7 +101,7 @@ void gdcmDict::Print(std::ostream &os) * Entries will be sorted by tag i.e. the couple (group, element). * @param os The output stream to be written to. */ -void gdcmDict::PrintByKey(std::ostream &os) +void Dict::PrintByKey(std::ostream &os) { std::ostringstream s; @@ -123,7 +125,7 @@ void gdcmDict::PrintByKey(std::ostream &os) * unpredictable result * @param os The output stream to be written to. */ -void gdcmDict::PrintByName(std::ostream& os) +void Dict::PrintByName(std::ostream& os) { std::ostringstream s; @@ -143,18 +145,18 @@ void gdcmDict::PrintByName(std::ostream& os) //----------------------------------------------------------------------------- // Public /** - * \ingroup gdcmDict + * \ingroup Dict * \brief adds a new Dicom Dictionary Entry * @param newEntry entry to add * @return false if Dicom Element already exists */ -bool gdcmDict::AddNewEntry(gdcmDictEntry *newEntry) +bool Dict::AddNewEntry(DictEntry *newEntry) { - gdcmTagKey key = newEntry->GetKey(); + TagKey key = newEntry->GetKey(); if(KeyHt.count(key) == 1) { - dbg.Verbose(1, "gdcmDict::AddNewEntry already present", key.c_str()); + dbg.Verbose(1, "Dict::AddNewEntry already present", key.c_str()); return false; } else @@ -166,14 +168,14 @@ bool gdcmDict::AddNewEntry(gdcmDictEntry *newEntry) } /** - * \ingroup gdcmDict + * \ingroup Dict * \brief replaces an already existing Dicom Element by a new one * @param newEntry new entry (overwrites any previous one with same tag) * @return false if Dicom Element doesn't exist */ -bool gdcmDict::ReplaceEntry(gdcmDictEntry *newEntry) +bool Dict::ReplaceEntry(DictEntry *newEntry) { - if ( RemoveEntry(newEntry->gdcmDictEntry::GetKey()) ) + if ( RemoveEntry(newEntry->DictEntry::GetKey()) ) { KeyHt[newEntry->GetKey()] = newEntry; NameHt[newEntry->GetName()] = newEntry; @@ -183,17 +185,18 @@ bool gdcmDict::ReplaceEntry(gdcmDictEntry *newEntry) } /** - * \ingroup gdcmDict + * \ingroup Dict * \brief removes an already existing Dicom Dictionary Entry, * identified by its Tag * @param key (group|element) * @return false if Dicom Dictionary Entry doesn't exist */ -bool gdcmDict::RemoveEntry(gdcmTagKey key) +bool Dict::RemoveEntry(TagKey const & key) { - if(KeyHt.count(key) == 1) + TagKeyHT::const_iterator it = KeyHt.find(key); + if(it != KeyHt.end()) { - gdcmDictEntry* entryToDelete = KeyHt.find(key)->second; + DictEntry* entryToDelete = it->second; if ( entryToDelete ) { @@ -206,7 +209,7 @@ bool gdcmDict::RemoveEntry(gdcmTagKey key) } else { - dbg.Verbose(1, "gdcmDict::RemoveEntry unfound entry", key.c_str()); + dbg.Verbose(1, "Dict::RemoveEntry unfound entry", key.c_str()); return false; } } @@ -218,9 +221,9 @@ bool gdcmDict::RemoveEntry(gdcmTagKey key) * @param element Dicom element number of the Dicom Element * @return false if Dicom Dictionary Entry doesn't exist */ -bool gdcmDict::RemoveEntry (uint16_t group, uint16_t element) +bool Dict::RemoveEntry (uint16_t group, uint16_t element) { - return RemoveEntry(gdcmDictEntry::TranslateToKey(group, element)); + return RemoveEntry(DictEntry::TranslateToKey(group, element)); } /** @@ -231,13 +234,14 @@ bool gdcmDict::RemoveEntry (uint16_t group, uint16_t element) * the name MAY CHANGE between two versions ! * @return the corresponding dictionnary entry when existing, NULL otherwise */ -gdcmDictEntry* gdcmDict::GetDictEntryByName(TagName name) +DictEntry* Dict::GetDictEntryByName(TagName const & name) { - if ( !NameHt.count(name)) + TagNameHT::const_iterator it = NameHt.find(name); + if ( it == NameHt.end() ) { return 0; } - return NameHt.find(name)->second; + return it->second; } /** @@ -246,25 +250,26 @@ gdcmDictEntry* gdcmDict::GetDictEntryByName(TagName name) * @param element element of the entry to be found * @return the corresponding dictionnary entry when existing, NULL otherwise */ -gdcmDictEntry* gdcmDict::GetDictEntryByNumber(uint16_t group, uint16_t element) +DictEntry* Dict::GetDictEntryByNumber(uint16_t group, uint16_t element) { - gdcmTagKey key = gdcmDictEntry::TranslateToKey(group, element); - if ( !KeyHt.count(key) ) + TagKey key = DictEntry::TranslateToKey(group, element); + TagKeyHT::const_iterator it = KeyHt.find(key); + if ( it == KeyHt.end() ) { return 0; } - return KeyHt.find(key)->second; + return it->second; } /** * \brief Consider all the entries of the public dicom dictionnary. * Build all list of all the tag names of all those entries. - * \sa gdcmDictSet::GetPubDictTagNamesByCategory + * \sa DictSet::GetPubDictTagNamesByCategory * @return A list of all entries of the public dicom dictionnary. */ -std::list* gdcmDict::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() ); @@ -273,7 +278,7 @@ std::list* gdcmDict::GetDictEntryNames() } /** - * \ingroup gdcmDict + * \ingroup Dict * \brief Consider all the entries of the public dicom dictionnary. * Build an hashtable whose keys are the names of the groups * (fourth field in each line of dictionary) and whose corresponding @@ -296,9 +301,9 @@ std::list* gdcmDict::GetDictEntryNames() * corresponding values are lists of all the dictionnary entries * among that group. */ -std::map > *gdcmDict::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) { @@ -315,3 +320,5 @@ std::map > *gdcmDict::GetDictEntryNamesByCat // Private //----------------------------------------------------------------------------- + +} // end namespace gdcm