X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictSet.cxx;h=ecef7934c3d3988d3e096d8da821c8af10f22017;hb=fa8fa610de8d935491343df2d8a543ff6fdb6e69;hp=53c1ff3c543c3d042045960e975a541a3eeebc0f;hpb=867b8ef63054497249cc3a0138107383d60351dc;p=gdcm.git diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx index 53c1ff3c..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: 2004/10/18 02:17:07 $ - Version: $Revision: 1.39 $ + 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 { @@ -27,9 +28,8 @@ namespace gdcm //----------------------------------------------------------------------------- // 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() { @@ -40,12 +40,11 @@ DictSet::DictSet() } /** - * \ingroup DictSet * \brief Destructor */ DictSet::~DictSet() { - // Remove dictionnaries + // Remove dictionaries for (DictSetHT::iterator tag = Dicts.begin(); tag != Dicts.end(); ++tag) { Dict *entryToDelete = tag->second; @@ -57,110 +56,39 @@ DictSet::~DictSet() } Dicts.clear(); - // Remove virtual dictionnary entries - std::map::iterator it; - for(it = VirtualEntry.begin(); it != VirtualEntry.end(); ++it) - { - DictEntry *entry = it->second; - if ( entry ) - { - delete entry; - } - it->second = NULL; - } -} - -//----------------------------------------------------------------------------- -// 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); - } + // Remove virtual dictionary entries + VirtualEntries.clear(); } //----------------------------------------------------------------------------- // 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 + * @param filename Absolute or relative filename containing the * dictionary to load. * @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); + Dict *newDict = new Dict(filename); AppendDict(newDict, name); 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; } @@ -168,78 +96,145 @@ Dict *DictSet::GetDict(DictKey const & dictName) } /** - * \brief Create a DictEntry which will be reference - * in no dictionnary + * \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 fourth, + TagName vm, TagName name) { - DictEntry* entry; - const std::string tag = DictEntry::TranslateToKey(group,element) - + "#" + vr + "#" + fourth + "#" + name; - std::map::iterator it; + DictEntry *entry; + + // 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; + entry = &(it->second); } else { - entry = new DictEntry(group, element, vr, fourth, name); - VirtualEntry[tag] = entry; + DictEntry ent(group, elem, vr, vm, name); + VirtualEntries.insert( + ExtendedTagKeyHT::value_type(tag, ent) ); + entry = &(VirtualEntries.find(tag)->second); } return entry; } +/** + * \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; +} + /** * \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 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 += '/'; - } - dbg.Verbose(1, "DictSet::BuildDictPath:", - "Dictionary path set from environnement"); + gdcmWarningMacro( "Dictionary path set from environnement"); } else { resultPath = PUB_DICT_PATH; } + if ( resultPath[resultPath.length()-1] != '/' ) + { + resultPath += '/'; + } return resultPath; } //----------------------------------------------------------------------------- // Protected -bool DictSet::AppendDict(Dict *newDict, DictKey const & name) +/** + * \brief Adds a Dictionary to a DictSet + * \return always true + */ +bool DictSet::AppendDict(Dict *newDict, DictKey const &name) { Dicts[name] = newDict; - return true; //FIXME + 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