X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDict.cxx;h=6287e9aa522325a18510c310e401801b9ae41c3c;hb=0e0403151bbff57175d2b974ee2d14b8195f9234;hp=1985e4e3eeb3e0bb7d69edbb2129a2792a26258e;hpb=70b9dde9da207191fa6d799fdf03c2aff7941273;p=gdcm.git diff --git a/src/gdcmDict.cxx b/src/gdcmDict.cxx index 1985e4e3..6287e9aa 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/07 16:26:12 $ - Version: $Revision: 1.58 $ + Date: $Date: 2005/01/24 14:14:11 $ + Version: $Revision: 1.70 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -29,6 +29,14 @@ namespace gdcm void FillDefaultDataDict(Dict *d); //----------------------------------------------------------------------------- // Constructor / Destructor +/** + * \brief Constructor + */ +Dict::Dict( ) +{ + Filename=""; +} + /** * \brief Constructor * @param filename from which to build the dictionary. @@ -44,7 +52,7 @@ Dict::Dict(std::string const &filename) std::ifstream from( filename.c_str() ); if( !from ) { - Debug::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 ); } @@ -61,12 +69,12 @@ Dict::Dict(std::string const &filename) std::getline(from, name); const DictEntry newEntry(group, element, vr, vm, name); - AddNewEntry(newEntry); + AddEntry(newEntry); } Filename = filename; + from.close(); } - from.close(); } /** @@ -74,9 +82,7 @@ Dict::Dict(std::string const &filename) */ Dict::~Dict() { - // we assume all the pointed DictEntries are already cleaned-up - // when we clean KeyHt. - KeyHt.clear(); + ClearEntry(); } //----------------------------------------------------------------------------- @@ -85,20 +91,11 @@ Dict::~Dict() * \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) +void Dict::Print(std::ostream &os, std::string const & ) { 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) @@ -114,21 +111,31 @@ void Dict::PrintByKey(std::ostream &os) os << s.str(); } + //----------------------------------------------------------------------------- // Public /** - * \ingroup Dict + * \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 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) { - Debug::Verbose(1, "Dict::AddNewEntry already present", key.c_str()); + gdcmVerboseMacro( "Already present" << key.c_str()); return false; } else @@ -139,7 +146,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 @@ -155,7 +161,6 @@ bool Dict::ReplaceEntry(DictEntry const &newEntry) } /** - * \ingroup Dict * \brief removes an already existing Dicom Dictionary Entry, * identified by its Tag * @param key (group|element) @@ -172,7 +177,7 @@ bool Dict::RemoveEntry (TagKey const &key) } else { - Debug::Verbose(1, "Dict::RemoveEntry unfound entry", key.c_str()); + gdcmVerboseMacro( "Unfound entry" << key.c_str()); return false; } } @@ -190,12 +195,12 @@ bool Dict::RemoveEntry (uint16_t group, uint16_t elem) } /** - * \brief Get the dictionnary entry identified by a given tag (group,element) + * \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 - * @return the corresponding dictionnary entry when existing, NULL otherwise + * @return the corresponding dictionary entry when existing, NULL otherwise */ -DictEntry *Dict::GetDictEntryByNumber(uint16_t group, uint16_t elem) +DictEntry *Dict::GetEntry(uint16_t group, uint16_t elem) { TagKey key = DictEntry::TranslateToKey(group, elem); TagKeyHT::iterator it = KeyHt.find(key); @@ -206,65 +211,34 @@ DictEntry *Dict::GetDictEntryByNumber(uint16_t group, uint16_t elem) 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 DictSet::GetPubDictTagNamesByCategory - * @return A list of all entries of the public dicom dictionnary. +/** + * \brief Get the first entry while visiting the Dict entries + * \return The first DicEntry if found, otherwhise NULL */ +DictEntry *Dict::GetFirstEntry() +{ + ItKeyHt = KeyHt.begin(); + if( ItKeyHt != KeyHt.end() ) + return &(ItKeyHt->second); + return NULL; +} - - // 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 dictionnary. - * 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 dictionnary 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 dictionnary 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' Dictionnary, that would be more friendly - * than asking us to perform a line by line check of the dictionnary - * 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 dictionnary entries - * among that group. +/** + * \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 */ - - // 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::GetNextEntry() +{ + gdcmAssertMacro (ItKeyHt != KeyHt.end()); + + { + ++ItKeyHt; + if (ItKeyHt != KeyHt.end()) + return &(ItKeyHt->second); + } + return NULL; +} //----------------------------------------------------------------------------- // Protected