X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictSet.cxx;h=fd2c0108272922df7e9888d999e15b24b897a1ff;hb=cfd7023dd0efe6d0cf17cdc1b31bbf17ac8a9ade;hp=e03a01a4d242b372d6ce2ec6f34ea09e06ecb99a;hpb=5bf7c51796867388334836847a6874640bc83f89;p=gdcm.git diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx index e03a01a4..fd2c0108 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/20 14:30:40 $ - Version: $Revision: 1.41 $ + Date: $Date: 2005/01/17 10:56:50 $ + Version: $Revision: 1.51 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -28,8 +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() { @@ -57,17 +57,8 @@ 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; - } + // Remove virtual dictionary entries + VirtualEntry.clear(); } //----------------------------------------------------------------------------- @@ -78,7 +69,7 @@ DictSet::~DictSet() * contained is this DictSet, along with their respective content. * @param os Output stream used for printing. */ -void DictSet::Print(std::ostream& os) +void DictSet::Print(std::ostream &os, std::string const & ) { for (DictSetHT::iterator dict = Dicts.begin(); dict != Dicts.end(); ++dict) { @@ -91,46 +82,55 @@ void DictSet::Print(std::ostream& os) // Public /** * \ingroup DictSet - * \brief Consider all the entries of the public dicom dictionnary. + * \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 dictionnary. + * @return A list of all entries of the public dicom dictionary. */ -EntryNamesList * DictSet::GetPubDictEntryNames() -{ - return GetDefaultPubDict()->GetDictEntryNames(); -} + +// Probabely useless! + +//EntryNamesList *DictSet::GetPubDictEntryNames() +//{ +// return GetDefaultPubDict()->GetDictEntryNames(); +//} /** * \ingroup DictSet * \brief - * - Consider all the entries of the public dicom dictionnary. + * - 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 dictionnary entries among that + * 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 dictionnary fourth field was formerly NIH defined + * (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' Dictionnary, that would be more friendly - * than asking us to perform a line by line check of the dictionnary + * 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 dictionnary entries + * corresponding values are lists of all the dictionary entries * among that group. */ -EntryNamesByCatMap * DictSet::GetPubDictEntryNamesByCategory() -{ - return GetDefaultPubDict()->GetDictEntryNamesByCategory(); -} + + +// Probabely useless! + +//EntryNamesByCatMap *DictSet::GetPubDictEntryNamesByCategory() +//{ +// return GetDefaultPubDict()->GetDictEntryNamesByCategory(); +//} /** * \ingroup DictSet @@ -157,7 +157,7 @@ Dict *DictSet::LoadDictFromFile(std::string const & filename, * @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()) @@ -168,30 +168,33 @@ 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 * @return virtual entry */ DictEntry *DictSet::NewVirtualDictEntry( uint16_t group, uint16_t element, TagName vr, - TagName fourth, + TagName vm, TagName name) { - DictEntry* entry; + DictEntry *entry; const std::string tag = DictEntry::TranslateToKey(group,element) - + "#" + vr + "#" + fourth + "#" + name; - std::map::iterator it; + + "#" + vr + "#" + vm + "#" + name; + TagKeyHT::iterator it; it = VirtualEntry.find(tag); if(it != VirtualEntry.end()) { - entry = it->second; + entry = &(it->second); } else { - entry = new DictEntry(group, element, vr, fourth, name); - VirtualEntry[tag] = entry; + DictEntry ent(group, element, vr, vm, name); + VirtualEntry.insert( + std::map::value_type + (tag, ent)); + entry = &(VirtualEntry.find(tag)->second); } return entry; @@ -217,8 +220,7 @@ std::string DictSet::BuildDictPath() { resultPath += '/'; } - dbg.Verbose(1, "DictSet::BuildDictPath:", - "Dictionary path set from environnement"); + gdcmVerboseMacro( "Dictionary path set from environnement"); } else { @@ -228,13 +230,41 @@ std::string DictSet::BuildDictPath() return resultPath; } + +/** + * \brief Initialise the visit of the Hash table (DictSetHT) + */ +void DictSet::InitTraversal() +{ + ItDictHt = Dicts.begin(); +} + +/** + * \brief Get the next entry while visiting the Hash table (DictSetHT) + * \return The next Dict if found, otherwhise NULL + */ +Dict *DictSet::GetNextEntry() +{ + if (ItDictHt != Dicts.end()) + { + Dict *tmp = ItDictHt->second; + ++ItDictHt; + + return tmp; + } + else + { + return NULL; + } +} + //----------------------------------------------------------------------------- // Protected -bool DictSet::AppendDict(Dict *newDict, DictKey const & name) +bool DictSet::AppendDict(Dict *newDict, DictKey const &name) { Dicts[name] = newDict; - return true; //FIXME + return true; } //-----------------------------------------------------------------------------