X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDict.cxx;h=bb6bd72eb67de471d3eee997c81c126abf696737;hb=933fb20f37f5f900c53c59b2a739e18303bd60d8;hp=cb0191bec2cc16da1952b9b5302f023277b60734;hpb=8a640d0e343dc47346cc7a72cd76582b9b429610;p=gdcm.git diff --git a/src/gdcmDict.cxx b/src/gdcmDict.cxx index cb0191be..bb6bd72e 100644 --- a/src/gdcmDict.cxx +++ b/src/gdcmDict.cxx @@ -3,12 +3,12 @@ Program: gdcm Module: $RCSfile: gdcmDict.cxx,v $ Language: C++ - Date: $Date: 2004/07/19 11:51:26 $ - Version: $Revision: 1.39 $ + Date: $Date: 2004/10/12 04:35:45 $ + Version: $Revision: 1.45 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or - http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR @@ -23,55 +23,61 @@ #include #include #include +namespace gdcm +{ //----------------------------------------------------------------------------- // Constructor / Destructor /** * \brief Construtor - * @param FileName from which to build the dictionary. + * @param filename from which to build the dictionary. */ -gdcmDict::gdcmDict(std::string & FileName) { +Dict::Dict(std::string const & filename) +{ uint16_t group; uint16_t element; - //char buff[1024]; TagName vr; TagName fourth; TagName name; - std::ifstream from(FileName.c_str()); - dbg.Error(!from, "gdcmDict::gdcmDict: can't open dictionary", - FileName.c_str()); + std::ifstream from( filename.c_str() ); + dbg.Error(!from, "Dict::Dict: can't open dictionary", + filename.c_str()); - while (!from.eof()) { + while (!from.eof()) + { from >> std::hex; from >> group; /// MEMORY LEAK in std::istream::operator>> from >> element; from >> vr; from >> fourth; - eatwhite(from); + from >> std::ws; // used to be eatwhite(from); std::getline(from, name); /// MEMORY LEAK in std::getline<> - gdcmDictEntry * newEntry = new gdcmDictEntry(group, element, + DictEntry * newEntry = new DictEntry(group, element, vr, fourth, name); AddNewEntry(newEntry); } from.close(); - filename=FileName; + Filename = filename; } /** * \brief Destructor */ -gdcmDict::~gdcmDict() { +Dict::~Dict() +{ for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag) { - gdcmDictEntry* EntryToDelete = tag->second; - if ( EntryToDelete ) - delete EntryToDelete; + 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(); @@ -84,8 +90,9 @@ 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) { - os<<"Dict file name : "<second->GetName() << ","; s << tag->second->GetVR() << ", "; @@ -136,71 +145,71 @@ void gdcmDict::PrintByName(std::ostream& os) { //----------------------------------------------------------------------------- // Public /** - * \ingroup gdcmDict + * \ingroup Dict * \brief adds a new Dicom Dictionary Entry - * @param NewEntry entry to add + * @param newEntry entry to add * @return false if Dicom Element already exists */ -bool gdcmDict::AddNewEntry(gdcmDictEntry *NewEntry) +bool Dict::AddNewEntry(DictEntry *newEntry) { - gdcmTagKey key; - key = NewEntry->GetKey(); + TagKey key = newEntry->GetKey(); if(KeyHt.count(key) == 1) { - dbg.Verbose(1, "gdcmDict::AddNewEntry already present", key.c_str()); - return(false); + dbg.Verbose(1, "Dict::AddNewEntry already present", key.c_str()); + return false; } else { - KeyHt[NewEntry->GetKey()] = NewEntry; - NameHt[NewEntry->GetName()] = NewEntry; /// MEMORY LEAK in - /// std::map<>::operator[] - return(true); + KeyHt[newEntry->GetKey()] = newEntry; + NameHt[newEntry->GetName()] = newEntry; + return true; } } /** - * \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) + * @param newEntry new entry (overwrites any previous one with same tag) * @return false if Dicom Element doesn't exist */ -bool gdcmDict::ReplaceEntry(gdcmDictEntry *NewEntry) { - if ( RemoveEntry(NewEntry->gdcmDictEntry::GetKey()) ) { - KeyHt[NewEntry->GetKey()] = NewEntry; - NameHt[NewEntry->GetName()] = NewEntry; - return (true); +bool Dict::ReplaceEntry(DictEntry *newEntry) +{ + if ( RemoveEntry(newEntry->DictEntry::GetKey()) ) + { + KeyHt[newEntry->GetKey()] = newEntry; + NameHt[newEntry->GetName()] = newEntry; + return true; } - return (false); + return false; } /** - * \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 key) { if(KeyHt.count(key) == 1) { - gdcmDictEntry* EntryToDelete = KeyHt.find(key)->second; + DictEntry* entryToDelete = KeyHt.find(key)->second; - if ( EntryToDelete ) + if ( entryToDelete ) { - NameHt.erase(EntryToDelete->GetName()); - delete EntryToDelete; + NameHt.erase(entryToDelete->GetName()); + delete entryToDelete; } KeyHt.erase(key); - return (true); + return true; } else { - dbg.Verbose(1, "gdcmDict::RemoveEntry unfound entry", key.c_str()); - return (false); + dbg.Verbose(1, "Dict::RemoveEntry unfound entry", key.c_str()); + return false; } } @@ -211,9 +220,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)); } /** @@ -224,9 +233,12 @@ 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) { - if ( ! NameHt.count(name)) - return NULL; +DictEntry* Dict::GetDictEntryByName(TagName name) +{ + if ( !NameHt.count(name)) + { + return 0; + } return NameHt.find(name)->second; } @@ -236,32 +248,34 @@ 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)) - return NULL; + TagKey key = DictEntry::TranslateToKey(group, element); + if ( !KeyHt.count(key) ) + { + return 0; + } return KeyHt.find(key)->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(void) +std::list* Dict::GetDictEntryNames() { - std::list *Result = new std::list; + std::list *result = new std::list; for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag) { - Result->push_back( tag->second->GetName() ); + result->push_back( tag->second->GetName() ); } - return Result; + return result; } /** - * \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 @@ -284,15 +298,16 @@ std::list* gdcmDict::GetDictEntryNames(void) * corresponding values are lists of all the dictionnary entries * among that group. */ -std::map > *gdcmDict::GetDictEntryNamesByCategory(void) +std::map > *Dict::GetDictEntryNamesByCategory(void) { - std::map > *Result = new std::map >; + std::map > *result = new std::map >; 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; + + return result; } //----------------------------------------------------------------------------- @@ -302,3 +317,5 @@ std::map > *gdcmDict::GetDictEntryNamesByCat // Private //----------------------------------------------------------------------------- + +} // end namespace gdcm