X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictSet.cxx;h=ecef7934c3d3988d3e096d8da821c8af10f22017;hb=fa8fa610de8d935491343df2d8a543ff6fdb6e69;hp=f8bb4f35d036407c104bd480d9c91ad632ff521b;hpb=ef0c45b292557174c768c2cc7fc11fea4d57e218;p=gdcm.git diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx index f8bb4f35..ecef7934 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 07:50:58 $ - Version: $Revision: 1.52 $ + Date: $Date: 2005/07/11 20:44:52 $ + Version: $Revision: 1.68 $ 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 { @@ -43,7 +44,7 @@ DictSet::DictSet() */ DictSet::~DictSet() { - // Remove dictionnaries + // Remove dictionaries for (DictSetHT::iterator tag = Dicts.begin(); tag != Dicts.end(); ++tag) { Dict *entryToDelete = tag->second; @@ -56,77 +57,11 @@ DictSet::~DictSet() 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); - } + VirtualEntries.clear(); } //----------------------------------------------------------------------------- // 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 +70,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 +88,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,69 +96,56 @@ Dict *DictSet::GetDict(DictKey const &dictName) } /** - * \brief Create a DictEntry which will be referenced - * in no dictionary + * \brief Create a DictEntry which will be referenced in no dictionary + * @param group Group number of the Entry + * @param elem Element number of the Entry + * @param vr Value Representation of the Entry + * @param vm Value Multiplicity of the Entry + * @param name English name of the Entry * @return virtual entry */ DictEntry *DictSet::NewVirtualDictEntry( uint16_t group, - uint16_t element, + uint16_t elem, TagName vr, TagName vm, TagName name) { DictEntry *entry; - const std::string tag = DictEntry::TranslateToKey(group,element) - + "#" + vr + "#" + vm + "#" + name; - TagKeyHT::iterator it; + + // Let's follow 'Purify' advice + // + // const std::string tag = DictEntry::TranslateToKey(group,elem) + // + "#" + vr + "#" + vm + "#" + name; +#if FASTTAGKEY && 0 + // FIXME + TagKey tag; + tag.tab[0] = group; + tag.tab[1] = elem; +#else + char res[10]; + sprintf(res,"%04x|%04x", group, elem); + ExtendedTagKey tag = res; + tag += "#" + vr + "#" + vm + "#" + name; +#endif + + ExtendedTagKeyHT::iterator it; - it = VirtualEntry.find(tag); - if(it != VirtualEntry.end()) + it = VirtualEntries.find(tag); + if ( it != VirtualEntries.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); + DictEntry ent(group, elem, vr, vm, name); + VirtualEntries.insert( + ExtendedTagKeyHT::value_type(tag, ent) ); + entry = &(VirtualEntries.find(tag)->second); } return entry; } -/** - * \brief Obtain from the GDCM_DICT_PATH environnement variable the - * path to directory containing the dictionnaries. When - * the environnement variable is absent the path is defaulted - * to "../Dicts/". - * @return path to directory containing the dictionnaries - */ -std::string DictSet::BuildDictPath() -{ - std::string resultPath; - const char *envPath = 0; - envPath = getenv("GDCM_DICT_PATH"); - - if (envPath && (strlen(envPath) != 0)) - { - resultPath = envPath; - if ( resultPath[resultPath.length()-1] != '/' ) - { - resultPath += '/'; - } - gdcmVerboseMacro( "Dictionary path set from environnement"); - } - else - { - resultPath = PUB_DICT_PATH; - } - - return resultPath; -} - - /** * \brief Get the first entry while visiting the DictSet * \return The first Dict if found, otherwhise NULL @@ -231,7 +153,9 @@ std::string DictSet::BuildDictPath() Dict *DictSet::GetFirstEntry() { ItDictHt = Dicts.begin(); - return ItDictHt->second; + if ( ItDictHt != Dicts.end() ) + return ItDictHt->second; + return NULL; } /** @@ -241,22 +165,46 @@ Dict *DictSet::GetFirstEntry() */ Dict *DictSet::GetNextEntry() { - if (ItDictHt != Dicts.end()) - { - Dict *tmp = ItDictHt->second; - ++ItDictHt; + gdcmAssertMacro (ItDictHt != Dicts.end()); + + ++ItDictHt; + if ( ItDictHt != Dicts.end() ) + return ItDictHt->second; + return NULL; +} - return tmp; - } +/** + * \brief Obtain from the GDCM_DICT_PATH environnement variable the + * path to directory containing the dictionaries. When + * the environnement variable is absent the path is defaulted + * to "../Dicts/". + * @return path to directory containing the dictionaries + */ +std::string DictSet::BuildDictPath() +{ + std::string resultPath; + const char *envPath; + envPath = getenv("GDCM_DICT_PATH"); + + if (envPath && (strlen(envPath) != 0)) + { + resultPath = envPath; + gdcmWarningMacro( "Dictionary path set from environnement"); + } else { - return NULL; + resultPath = PUB_DICT_PATH; + } + if ( resultPath[resultPath.length()-1] != '/' ) + { + resultPath += '/'; } + + return resultPath; } //----------------------------------------------------------------------------- // Protected - /** * \brief Adds a Dictionary to a DictSet * \return always true @@ -272,5 +220,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