X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictSet.cxx;h=32a5023a73c2f85391bc159403fe899d852da4c1;hb=a93b48c4c573b00622ded9c58ed848d6048bc0f5;hp=a44e8fdc219f29ad24b236c64a881f55467d84bf;hpb=963480c814326423065a4a02fa1bf8bc1243ae4f;p=gdcm.git diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx index a44e8fdc..32a5023a 100644 --- a/src/gdcmDictSet.cxx +++ b/src/gdcmDictSet.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDictSet.cxx,v $ Language: C++ - Date: $Date: 2005/01/18 11:40:00 $ - Version: $Revision: 1.54 $ + Date: $Date: 2005/10/20 15:24:08 $ + Version: $Revision: 1.71 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -20,6 +20,7 @@ #include "gdcmDebug.h" #include #include // For getenv +#include // For sprintf namespace gdcm { @@ -54,79 +55,10 @@ DictSet::~DictSet() tag->second = NULL; } Dicts.clear(); - - // Remove virtual dictionary entries - VirtualEntry.clear(); -} - -//----------------------------------------------------------------------------- -// Print -/** - * \brief Print, in an informal fashion, the list of all the dictionaries - * contained is this DictSet, along with their respective content. - * @param os Output stream used for printing. - */ -void DictSet::Print(std::ostream &os, std::string const & ) -{ - for (DictSetHT::iterator dict = Dicts.begin(); dict != Dicts.end(); ++dict) - { - os << "Printing dictionary " << dict->first << std::endl; - dict->second->Print(os); - } } //----------------------------------------------------------------------------- // Public -/** - * \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 *DictSet::GetPubDictEntryNames() -//{ -// return GetDefaultPubDict()->GetDictEntryNames(); -//} - -/** - * \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. - * NO ! Dicom Standard explicitely doesn't define - * any name, for any 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 *DictSet::GetPubDictEntryNamesByCategory() -//{ -// return GetDefaultPubDict()->GetDictEntryNamesByCategory(); -//} - /** * \brief Loads a dictionary from a specified file, and add it * to already the existing ones contained in this DictSet. @@ -135,8 +67,8 @@ void DictSet::Print(std::ostream &os, std::string const & ) * @param name Symbolic name that be used as identifier of the newly * created dictionary. */ -Dict *DictSet::LoadDictFromFile(std::string const & filename, - DictKey const & name) +Dict *DictSet::LoadDictFromFile(std::string const &filename, + DictKey const &name) { Dict *newDict = new Dict(filename); AppendDict(newDict, name); @@ -153,7 +85,7 @@ Dict *DictSet::LoadDictFromFile(std::string const & filename, Dict *DictSet::GetDict(DictKey const &dictName) { DictSetHT::iterator dict = Dicts.find(dictName); - if(dict != Dicts.end()) + if ( dict != Dicts.end() ) { return dict->second; } @@ -161,36 +93,30 @@ Dict *DictSet::GetDict(DictKey const &dictName) } /** - * \brief Create a DictEntry which will be referenced - * in no dictionary - * @return virtual entry + * \brief Get the first dictionary while visiting the DictSet + * \return The first Dict if found, otherwhise NULL */ -DictEntry *DictSet::NewVirtualDictEntry( uint16_t group, - uint16_t element, - TagName vr, - TagName vm, - TagName name) +Dict *DictSet::GetFirstDict() { - DictEntry *entry; - const std::string tag = DictEntry::TranslateToKey(group,element) - + "#" + vr + "#" + vm + "#" + name; - TagKeyHT::iterator it; - - it = VirtualEntry.find(tag); - if(it != VirtualEntry.end()) - { - entry = &(it->second); - } - else - { - DictEntry ent(group, element, vr, vm, name); - VirtualEntry.insert( - std::map::value_type - (tag, ent)); - entry = &(VirtualEntry.find(tag)->second); - } + ItDictHt = Dicts.begin(); + if ( ItDictHt != Dicts.end() ) + return ItDictHt->second; + return NULL; +} - return entry; +/** + * \brief Get the next dictionary while visiting the Hash table (DictSetHT) + * \note : meaningfull only if GetFirstEntry already called + * \return The next Dict if found, otherwhise NULL + */ +Dict *DictSet::GetNextDict() +{ + gdcmAssertMacro (ItDictHt != Dicts.end()); + + ++ItDictHt; + if ( ItDictHt != Dicts.end() ) + return ItDictHt->second; + return NULL; } /** @@ -203,57 +129,28 @@ DictEntry *DictSet::NewVirtualDictEntry( uint16_t group, std::string DictSet::BuildDictPath() { std::string resultPath; - const char *envPath = 0; + const char *envPath; envPath = getenv("GDCM_DICT_PATH"); if (envPath && (strlen(envPath) != 0)) { resultPath = envPath; - if ( resultPath[resultPath.length()-1] != '/' ) - { - resultPath += '/'; - } - gdcmVerboseMacro( "Dictionary path set from environnement"); + gdcmWarningMacro( "Dictionary path set from environnement"); } else { resultPath = PUB_DICT_PATH; } + if ( resultPath[resultPath.length()-1] != '/' ) + { + resultPath += '/'; + } return resultPath; } - -/** - * \brief Get the first entry while visiting the DictSet - * \return The first Dict if found, otherwhise NULL - */ -Dict *DictSet::GetFirstEntry() -{ - ItDictHt = Dicts.begin(); - if( ItDictHt != Dicts.end() ) - return ItDictHt->second; - return NULL; -} - -/** - * \brief Get the next entry while visiting the Hash table (DictSetHT) - * \note : meaningfull only if GetFirstEntry already called - * \return The next Dict if found, otherwhise NULL - */ -Dict *DictSet::GetNextEntry() -{ - gdcmAssertMacro (ItDictHt != Dicts.end()); - - ++ItDictHt; - if ( ItDictHt != Dicts.end() ) - return ItDictHt->second; - return NULL; -} - //----------------------------------------------------------------------------- // Protected - /** * \brief Adds a Dictionary to a DictSet * \return always true @@ -269,5 +166,21 @@ bool DictSet::AppendDict(Dict *newDict, DictKey const &name) // Private //----------------------------------------------------------------------------- +// Print +/** + * \brief Print, in an informal fashion, the list of all the dictionaries + * contained is this DictSet, along with their respective content. + * @param os Output stream used for printing. + * @param indent Indentation string to be prepended during printing + */ +void DictSet::Print(std::ostream &os, std::string const & ) +{ + for (DictSetHT::iterator dict = Dicts.begin(); dict != Dicts.end(); ++dict) + { + os << "Printing dictionary " << dict->first << std::endl; + dict->second->Print(os); + } +} +//----------------------------------------------------------------------------- } // end namespace gdcm