X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictSet.cxx;h=b173a08846f7dfeec47b4e6a08a74b8d41c863e6;hb=76ac46b16fd92d0fb444f786d4946424d9029315;hp=3b3c53c6ee9eff6b7fa79e9653f2e32d9d770f82;hpb=c77dd6febbf12b5b0d5401008ced0c575b61a5f7;p=gdcm.git diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx index 3b3c53c6..b173a088 100644 --- a/src/gdcmDictSet.cxx +++ b/src/gdcmDictSet.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDictSet.cxx,v $ Language: C++ - Date: $Date: 2004/10/28 19:53:29 $ - Version: $Revision: 1.44 $ + Date: $Date: 2007/05/23 14:18:09 $ + Version: $Revision: 1.78 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -18,113 +18,48 @@ #include "gdcmDictSet.h" #include "gdcmDebug.h" +#include "gdcmGlobal.h" #include #include // For getenv +#include // For sprintf -namespace gdcm +namespace GDCM_NAME_SPACE { //----------------------------------------------------------------------------- // Constructor / Destructor /** - * \ingroup DictSet - * \brief The Dictionnary Set obtained with this constructor simply - * contains the Default Public dictionnary. + * \brief The Dictionary Set obtained with this constructor simply + * contains the Default Public dictionary. */ DictSet::DictSet() { DictPath = BuildDictPath(); std::string pubDictFile(DictPath); pubDictFile += PUB_DICT_FILENAME; - Dicts[PUB_DICT_NAME] = new Dict(pubDictFile); + Dicts[PUB_DICT_NAME] = Dict::New(pubDictFile); + // Stored redundantly to avoid at access HTable DictSet every time. + Global::DefaultPubDict = Dicts[PUB_DICT_NAME]; } /** - * \ingroup DictSet * \brief Destructor */ DictSet::~DictSet() { - // Remove dictionnaries + Global::DefaultPubDict = 0; // just a pointer! + // Remove dictionaries for (DictSetHT::iterator tag = Dicts.begin(); tag != Dicts.end(); ++tag) { - Dict *entryToDelete = tag->second; - if ( entryToDelete ) - { - delete entryToDelete; - } - tag->second = NULL; + if ( tag->second ) + tag->second->Delete(); } Dicts.clear(); - - // Remove virtual dictionnary entries - VirtualEntry.clear(); -} - -//----------------------------------------------------------------------------- -// Print -/** - * \ingroup DictSet - * \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) -{ - for (DictSetHT::iterator dict = Dicts.begin(); dict != Dicts.end(); ++dict) - { - os << "Printing dictionary " << dict->first << std::endl; - dict->second->Print(os); - } } //----------------------------------------------------------------------------- // Public -/** - * \ingroup DictSet - * \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. - */ -EntryNamesList * DictSet::GetPubDictEntryNames() -{ - return GetDefaultPubDict()->GetDictEntryNames(); -} - -/** - * \ingroup DictSet - * \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. - */ -EntryNamesByCatMap * DictSet::GetPubDictEntryNamesByCategory() -{ - return GetDefaultPubDict()->GetDictEntryNamesByCategory(); -} - /** - * \ingroup DictSet * \brief Loads a dictionary from a specified file, and add it * to already the existing ones contained in this DictSet. * @param filename Absolute or relative filename containing the @@ -132,26 +67,27 @@ EntryNamesByCatMap * DictSet::GetPubDictEntryNamesByCategory() * @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); + assert(Dicts.find(name)==Dicts.end()); + ///\todo RemoveDict(name); when Dict already exist + Dict *newDict = Dict::New(filename); + Dicts[name] = newDict; return newDict; } /** - * \ingroup DictSet * \brief Retrieve the specified dictionary (when existing) from this * DictSet. * @param dictName The symbolic name of the searched dictionary. * \result The retrieved dictionary. */ -Dict *DictSet::GetDict(DictKey const & dictName) +Dict *DictSet::GetDict(DictKey const &dictName) { DictSetHT::iterator dict = Dicts.find(dictName); - if(dict != Dicts.end()) + if ( dict != Dicts.end() ) { return dict->second; } @@ -159,81 +95,82 @@ Dict *DictSet::GetDict(DictKey const & dictName) } /** - * \brief Create a DictEntry which will be reference - * in no dictionnary - * @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 fourth, - TagName name) +Dict *DictSet::GetFirstDict() { - DictEntry *entry; - const std::string tag = DictEntry::TranslateToKey(group,element) - + "#" + vr + "#" + fourth + "#" + name; - TagKeyHT::iterator it; - - it = VirtualEntry.find(tag); - if(it != VirtualEntry.end()) - { - entry = &(it->second); - } - else - { - DictEntry ent(group, element, vr, fourth, 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; } /** * \brief Obtain from the GDCM_DICT_PATH environnement variable the - * path to directory containing the dictionnaries. When + * path to directory containing the dictionaries. When * the environnement variable is absent the path is defaulted * to "../Dicts/". - * @return path to directory containing the dictionnaries + * @return path to directory containing the dictionaries */ -std::string DictSet::BuildDictPath() +std::string DictSet::BuildDictPath() { std::string resultPath; - const char *envPath = 0; - envPath = getenv("GDCM_DICT_PATH"); + const char *envPath = getenv("GDCM_DICT_PATH"); - if (envPath && (strlen(envPath) != 0)) + if (envPath && (strlen(envPath) != 0)) { resultPath = envPath; - if ( resultPath[resultPath.length()-1] != '/' ) - { - resultPath += '/'; - } - dbg.Verbose(1, "DictSet::BuildDictPath:", - "Dictionary path set from environnement"); - } + gdcmStaticWarningMacro( "Dictionary path set from environnement"); + } else { resultPath = PUB_DICT_PATH; } - + if ( resultPath.length() && resultPath[resultPath.length()-1] != '/' ) + { + resultPath += '/'; + } return resultPath; } //----------------------------------------------------------------------------- // Protected -bool DictSet::AppendDict(Dict *newDict, DictKey const & name) -{ - Dicts[name] = newDict; - - return true; -} //----------------------------------------------------------------------------- // 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