X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDict.cxx;h=9c3235c78aecf84bf549034b05653de9058ba1d6;hb=5887c4beef24959af83e43efad0bb86acac9339e;hp=19b9363999d81d478884c554acff33f6c60dc107;hpb=a0091d68a2eaa1a0c128f962030bb6c45cc0c366;p=gdcm.git diff --git a/src/gdcmDict.cxx b/src/gdcmDict.cxx index 19b93639..9c3235c7 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/11/16 02:54:35 $ - Version: $Revision: 1.52 $ + Date: $Date: 2005/01/12 15:23:44 $ + Version: $Revision: 1.62 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -30,21 +30,21 @@ void FillDefaultDataDict(Dict *d); //----------------------------------------------------------------------------- // Constructor / Destructor /** - * \brief Construtor + * \brief Constructor * @param filename from which to build the dictionary. */ -Dict::Dict(std::string const & filename) +Dict::Dict(std::string const &filename) { uint16_t group; uint16_t element; TagName vr; - TagName fourth; + TagName vm; TagName name; std::ifstream from( filename.c_str() ); if( !from ) { - dbg.Verbose(2,"Dict::Dict: can't open dictionary", filename.c_str()); + gdcmVerboseMacro( "Can't open dictionary" << filename.c_str()); // Using default embeded one: FillDefaultDataDict( this ); } @@ -56,17 +56,17 @@ Dict::Dict(std::string const & filename) from >> group; from >> element; from >> vr; - from >> fourth; + from >> vm; from >> std::ws; //remove white space std::getline(from, name); - const DictEntry newEntry(group, element, vr, fourth, name); + const DictEntry newEntry(group, element, vr, vm, name); AddNewEntry(newEntry); } Filename = filename; + from.close(); } - from.close(); } /** @@ -74,11 +74,9 @@ Dict::Dict(std::string const & filename) */ Dict::~Dict() { - // Since AddNewEntry adds symetrical in both KeyHt and NameHT we can - // assume all the pointed DictEntries are already cleaned-up when - // we cleaned KeyHt. + // we assume all the pointed DictEntries are already cleaned-up + // when we clean KeyHt. KeyHt.clear(); - NameHt.clear(); } //----------------------------------------------------------------------------- @@ -91,16 +89,6 @@ Dict::~Dict() void Dict::Print(std::ostream &os) { os << "Dict file name : " << Filename << std::endl; - PrintByKey(os); -} - -/** - * \brief Print all the dictionary entries contained in this dictionary. - * Entries will be sorted by tag i.e. the couple (group, element). - * @param os The output stream to be written to. - */ -void Dict::PrintByKey(std::ostream &os) -{ std::ostringstream s; for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag) @@ -110,35 +98,12 @@ void Dict::PrintByKey(std::ostream &os) s << std::hex << std::setw(4) << tag->second.GetElement() << ") = " << std::dec; s << tag->second.GetVR() << ", "; - s << tag->second.GetFourth() << ", "; + s << tag->second.GetVM() << ", "; s << tag->second.GetName() << "." << std::endl; } os << s.str(); } -/** - * \brief Print all the dictionary entries contained in this dictionary. - * Entries will be sorted by the name of the dictionary entries. - * \warning AVOID USING IT : the name IS NOT an identifier; - * unpredictable result - * @param os The output stream to be written to. - */ -void Dict::PrintByName(std::ostream& os) -{ - std::ostringstream s; - - 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 << std::dec << std::endl; - } - os << s.str(); -} //----------------------------------------------------------------------------- // Public @@ -148,19 +113,18 @@ void Dict::PrintByName(std::ostream& os) * @param newEntry entry to add * @return false if Dicom Element already exists */ -bool Dict::AddNewEntry(DictEntry const & newEntry) +bool Dict::AddNewEntry(DictEntry const &newEntry) { - const TagKey & key = newEntry.GetKey(); + const TagKey &key = newEntry.GetKey(); if(KeyHt.count(key) == 1) { - dbg.Verbose(1, "Dict::AddNewEntry already present", key.c_str()); + gdcmVerboseMacro( "Already present" << key.c_str()); return false; } else { KeyHt.insert( TagKeyHT::value_type(newEntry.GetKey(), newEntry)); - NameHt.insert( TagNameHT::value_type(newEntry.GetName(), newEntry )); return true; } } @@ -171,12 +135,11 @@ bool Dict::AddNewEntry(DictEntry const & newEntry) * @param newEntry new entry (overwrites any previous one with same tag) * @return false if Dicom Element doesn't exist */ -bool Dict::ReplaceEntry(DictEntry const & newEntry) +bool Dict::ReplaceEntry(DictEntry const &newEntry) { if ( RemoveEntry(newEntry.GetKey()) ) { KeyHt.insert( TagKeyHT::value_type(newEntry.GetKey(), newEntry)); - NameHt.insert( TagNameHT::value_type(newEntry.GetName(), newEntry )); return true; } return false; @@ -189,20 +152,18 @@ bool Dict::ReplaceEntry(DictEntry const & newEntry) * @param key (group|element) * @return false if Dicom Dictionary Entry doesn't exist */ -bool Dict::RemoveEntry (TagKey const & key) +bool Dict::RemoveEntry (TagKey const &key) { TagKeyHT::const_iterator it = KeyHt.find(key); if(it != KeyHt.end()) { - const DictEntry& entryToDelete = it->second; - NameHt.erase(entryToDelete.GetName()); KeyHt.erase(key); return true; } else { - dbg.Verbose(1, "Dict::RemoveEntry unfound entry", key.c_str()); + gdcmVerboseMacro( "Unfound entry" << key.c_str()); return false; } } @@ -211,41 +172,23 @@ bool Dict::RemoveEntry (TagKey const & key) * \brief removes an already existing Dicom Dictionary Entry, * identified by its group,element number * @param group Dicom group number of the Dicom Element - * @param element Dicom element number of the Dicom Element + * @param elem Dicom element number of the Dicom Element * @return false if Dicom Dictionary Entry doesn't exist */ -bool Dict::RemoveEntry (uint16_t group, uint16_t element) +bool Dict::RemoveEntry (uint16_t group, uint16_t elem) { - return RemoveEntry(DictEntry::TranslateToKey(group, 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 Dictionary - * the name MAY CHANGE between two versions ! - * @return the corresponding dictionnary entry when existing, NULL otherwise - */ -DictEntry* Dict::GetDictEntryByName(TagName const & name) -{ - TagNameHT::iterator it = NameHt.find(name); - if ( it == NameHt.end() ) - { - return 0; - } - return &(it->second); + return RemoveEntry(DictEntry::TranslateToKey(group, elem)); } /** * \brief Get the dictionnary entry identified by a given tag (group,element) * @param group group of the entry to be found - * @param element element of the entry to be found + * @param elem element of the entry to be found * @return the corresponding dictionnary entry when existing, NULL otherwise */ -DictEntry* Dict::GetDictEntryByNumber(uint16_t group, uint16_t element) +DictEntry *Dict::GetDictEntry(uint16_t group, uint16_t elem) { - TagKey key = DictEntry::TranslateToKey(group, element); + TagKey key = DictEntry::TranslateToKey(group, elem); TagKeyHT::iterator it = KeyHt.find(key); if ( it == KeyHt.end() ) { @@ -260,15 +203,20 @@ DictEntry* Dict::GetDictEntryByNumber(uint16_t group, uint16_t element) * \sa DictSet::GetPubDictTagNamesByCategory * @return A list of all entries of the public dicom dictionnary. */ -EntryNamesList* Dict::GetDictEntryNames() -{ - EntryNamesList *result = new EntryNamesList; - for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag) - { - result->push_back( tag->second.GetName() ); - } - return result; -} + + + // Probabely useless + + +//EntryNamesList *Dict::GetDictEntryNames() +//{ +// EntryNamesList *result = new EntryNamesList; +// for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag) +// { +// result->push_back( tag->second.GetName() ); +// } +// return result; +//} /** * \ingroup Dict @@ -294,17 +242,20 @@ EntryNamesList* Dict::GetDictEntryNames() * corresponding values are lists of all the dictionnary entries * among that group. */ -EntryNamesByCatMap *Dict::GetDictEntryNamesByCategory() -{ - EntryNamesByCatMap *result = new EntryNamesByCatMap; - - for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag) - { - (*result)[tag->second.GetFourth()].push_back(tag->second.GetName()); - } - - return result; -} + + // Probabely useless + +//EntryNamesByCatMap *Dict::GetDictEntryNamesByCategory() +//{ +// EntryNamesByCatMap *result = new EntryNamesByCatMap; +// +// for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag) +// { +// (*result)[tag->second.GetFourth()].push_back(tag->second.GetName()); +// } +// +// return result; +//} //----------------------------------------------------------------------------- // Protected