X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmDict.cxx;h=5744e79040aebb373879a1700c87bd1ee808de1b;hb=fa8fa610de8d935491343df2d8a543ff6fdb6e69;hp=5d1a7826505fd3c62a8bfbd6901207a8b6e25008;hpb=2f79ae87219e7b7433eb89f71d2f05a03f60af69;p=gdcm.git diff --git a/src/gdcmDict.cxx b/src/gdcmDict.cxx index 5d1a7826..5744e790 100644 --- a/src/gdcmDict.cxx +++ b/src/gdcmDict.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDict.cxx,v $ Language: C++ - Date: $Date: 2005/01/17 11:13:21 $ - Version: $Revision: 1.65 $ + Date: $Date: 2005/09/02 07:00:04 $ + Version: $Revision: 1.79 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -26,7 +26,11 @@ namespace gdcm { +//----------------------------------------------------------------------------- +/// \brief auto generated function, to fill up the Dicom Dictionnary, +/// if relevant file is not found on user's disk void FillDefaultDataDict(Dict *d); + //----------------------------------------------------------------------------- // Constructor / Destructor /** @@ -43,37 +47,18 @@ Dict::Dict( ) */ Dict::Dict(std::string const &filename) { - uint16_t group; - uint16_t element; - TagName vr; - TagName vm; - TagName name; std::ifstream from( filename.c_str() ); - if( !from ) + if ( !from ) { - gdcmVerboseMacro( "Can't open dictionary" << filename.c_str()); + gdcmWarningMacro( "Can't open dictionary" << filename.c_str()); // Using default embeded one: FillDefaultDataDict( this ); } else { - while (!from.eof()) - { - from >> std::hex; - from >> group; - from >> element; - from >> vr; - from >> vm; - from >> std::ws; //remove white space - std::getline(from, name); - - const DictEntry newEntry(group, element, vr, vm, name); - AddNewEntry(newEntry); - } - + DoTheLoadingJob(from); Filename = filename; - from.close(); } } @@ -86,57 +71,80 @@ Dict::~Dict() } //----------------------------------------------------------------------------- -// Print +// Public + /** - * \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. + * \brief Add a all the entries held in a source dictionary + * \note it concerns only Private Dictionnary + * @param filename from which to build the dictionary. */ -void Dict::Print(std::ostream &os, std::string const & ) +bool Dict::AddDict(std::string const &filename) { - os << "Dict file name : " << Filename << std::endl; - std::ostringstream s; - for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag) + std::ifstream from( filename.c_str() ); + if ( !from ) { - s << "Entry : "; - 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.GetVM() << ", "; - s << tag->second.GetName() << "." << std::endl; + gdcmWarningMacro( "Can't open dictionary" << filename.c_str()); + return false; + } + else + { + DoTheLoadingJob(from); + return true; } - os << s.str(); } -//----------------------------------------------------------------------------- -// Public /** - * \ingroup Dict - * \brief Remove all Dicom Dictionary Entries + * \brief Removes from the current Dicom Dict all the entries held in a source dictionary + * \note it concerns only Private Dictionnary + * @param filename from which we read the entries to remove. */ -void Dict::ClearEntry() +bool Dict::RemoveDict(std::string const &filename) { - // we assume all the pointed DictEntries are already cleaned-up - // when we clean KeyHt. - KeyHt.clear(); + std::ifstream from( filename.c_str() ); + if ( !from ) + { + gdcmWarningMacro( "Can't open dictionary" << filename.c_str()); + return false; + } + else + { + uint16_t group; + uint16_t elem; + TagName vr; + TagName vm; + TagName name; + + while (!from.eof() && from) + { + from >> std::hex; + from >> group; + from >> elem; + from >> vr; + from >> vm; + // from >> std::ws; //remove white space + std::getline(from, name); + + RemoveEntry(DictEntry::TranslateToKey(group, elem)); + } + from.close(); + return true; + } } /** - * \ingroup Dict * \brief adds a new Dicom Dictionary Entry * @param newEntry entry to add * @return false if Dicom Element already exists */ -bool Dict::AddNewEntry(DictEntry const &newEntry) +bool Dict::AddEntry(DictEntry const &newEntry) { const TagKey &key = newEntry.GetKey(); - if(KeyHt.count(key) == 1) + if ( KeyHt.count(key) == 1 ) { - gdcmVerboseMacro( "Already present" << key.c_str()); + gdcmErrorMacro( "Already present:" << key ); return false; } else @@ -147,7 +155,6 @@ bool Dict::AddNewEntry(DictEntry const &newEntry) } /** - * \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 @@ -163,16 +170,15 @@ bool Dict::ReplaceEntry(DictEntry const &newEntry) } /** - * \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 Dict::RemoveEntry (TagKey const &key) +bool Dict::RemoveEntry(TagKey const &key) { TagKeyHT::const_iterator it = KeyHt.find(key); - if(it != KeyHt.end()) + if ( it != KeyHt.end() ) { KeyHt.erase(key); @@ -180,7 +186,7 @@ bool Dict::RemoveEntry (TagKey const &key) } else { - gdcmVerboseMacro( "Unfound entry" << key.c_str()); + gdcmWarningMacro( "Unfound entry" << key ); return false; } } @@ -192,20 +198,28 @@ bool Dict::RemoveEntry (TagKey const &key) * @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 elem) +bool Dict::RemoveEntry(uint16_t group, uint16_t elem) { return RemoveEntry(DictEntry::TranslateToKey(group, elem)); } /** - * \brief Get the dictionary entry identified by a given tag (group,element) - * @param group group of the entry to be found - * @param elem element of the entry to be found + * \brief Remove all Dicom Dictionary Entries + */ +void Dict::ClearEntry() +{ + // we assume all the pointed DictEntries are already cleaned-up + // when we clean KeyHt. + KeyHt.clear(); +} + +/** + * \brief Get the dictionary entry identified by a given tag ("group|element") + * @param key tag of the entry to be found * @return the corresponding dictionary entry when existing, NULL otherwise */ -DictEntry *Dict::GetDictEntry(uint16_t group, uint16_t elem) +DictEntry *Dict::GetEntry(TagKey const &key) { - TagKey key = DictEntry::TranslateToKey(group, elem); TagKeyHT::iterator it = KeyHt.find(key); if ( it == KeyHt.end() ) { @@ -214,91 +228,42 @@ DictEntry *Dict::GetDictEntry(uint16_t group, uint16_t elem) return &(it->second); } -/** - * \brief Consider all the entries of the public dicom dictionary. - * Build all list of all the tag names of all those entries. - * \sa DictSet::GetPubDictTagNamesByCategory - * @return A list of all entries of the public dicom dictionary. - */ - - - // 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 - * \brief Consider all the entries of the public dicom dictionary. - * Build an hashtable whose keys are the names of the groups - * (fourth field in each line of dictionary) and whose corresponding - * values are lists of all the dictionary entries among that - * group. Note that apparently the Dicom standard doesn't explicitely - * define a name (as a string) for each group. - * A typical usage of this method would be to enable a dynamic - * configuration of a Dicom file browser: the admin/user can - * select in the interface which Dicom tags should be displayed. - * \warning Dicom *doesn't* define any name for any 'categorie' - * (the dictionary fourth field was formerly NIH defined - * - and no longer he is- - * and will be removed when Dicom provides us a text file - * with the 'official' Dictionary, that would be more friendly - * than asking us to perform a line by line check of the dictionary - * at the beginning of each year to -try to- guess the changes) - * Therefore : please NEVER use that fourth field :-( - * - * @return An hashtable: whose keys are the names of the groups and whose - * corresponding values are lists of all the dictionary entries - * among that group. - */ - - // 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; -//} +DictEntry *Dict::GetEntry(uint16_t group, uint16_t elem) +{ + TagKey key = DictEntry::TranslateToKey(group, elem); + TagKeyHT::iterator it = KeyHt.find(key); + if ( it == KeyHt.end() ) + { + return 0; + } + return &(it->second); +} /** - * \brief Initialise the visit of the Hash table (KeyHt) + * \brief Get the first entry while visiting the Dict entries + * \return The first DicEntry if found, otherwhise NULL */ -void Dict::InitTraversal() +DictEntry *Dict::GetFirstEntry() { ItKeyHt = KeyHt.begin(); + if ( ItKeyHt != KeyHt.end() ) + return &(ItKeyHt->second); + return NULL; } /** * \brief Get the next entry while visiting the Hash table (KeyHt) + * \note : meaningfull only if GetFirstEntry already called * \return The next DictEntry if found, otherwhise NULL */ DictEntry *Dict::GetNextEntry() { - if (ItKeyHt != KeyHt.end()) - { - DictEntry *tmp = &(ItKeyHt->second); - ++ItKeyHt; + gdcmAssertMacro (ItKeyHt != KeyHt.end()); - return tmp; - } - else - { - return NULL; - } + ++ItKeyHt; + if (ItKeyHt != KeyHt.end()) + return &(ItKeyHt->second); + return NULL; } //----------------------------------------------------------------------------- @@ -306,7 +271,58 @@ DictEntry *Dict::GetNextEntry() //----------------------------------------------------------------------------- // Private +/** + * \brief Add all the dictionary entries from an already open source file + * @param from input stream to read from. + */ +void Dict::DoTheLoadingJob(std::ifstream &from) +{ + uint16_t group; + uint16_t elem; + TagName vr; + TagName vm; + TagName name; + while (!from.eof() && from) + { + from >> std::hex; + from >> group; + from >> elem; + from >> vr; + from >> vm; + from >> std::ws; //remove white space + std::getline(from, name); + + const DictEntry newEntry(group, elem, vr, vm, name); + AddEntry(newEntry); + } + from.close(); +} //----------------------------------------------------------------------------- +// Print +/** + * \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. + * @param indent Indentation string to be prepended during printing + */ +void Dict::Print(std::ostream &os, std::string const & ) +{ + os << "Dict file name : " << Filename << std::endl; + std::ostringstream s; + + 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() << ") = " + << std::dec; + s << tag->second.GetVR() << ", "; + s << tag->second.GetVM() << ", "; + s << tag->second.GetName() << "." << std::endl; + } + os << s.str(); +} +//----------------------------------------------------------------------------- } // end namespace gdcm