X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictSet.cxx;h=f4ae8c8c7c7ddabf2d610d40315287e19599ce06;hb=130558c1fc10cbc2d5d58484b310fa86bd20d81b;hp=a18a25faff4cb6b2b0395d29c63fc08a34da83e6;hpb=1d69b92978803204089d270599133917d944c651;p=gdcm.git diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx index a18a25fa..f4ae8c8c 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/12 04:35:45 $ - Version: $Revision: 1.38 $ + Date: $Date: 2005/01/18 14:28:32 $ + Version: $Revision: 1.55 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -20,15 +20,15 @@ #include "gdcmDebug.h" #include #include // For getenv + 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() { @@ -39,12 +39,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; @@ -56,28 +55,19 @@ 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(); } //----------------------------------------------------------------------------- // 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. + * @param indent indent */ -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) { @@ -89,75 +79,79 @@ 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. */ -std::list *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. */ -std::map > * - DictSet::GetPubDictEntryNamesByCategory() -{ - return GetDefaultPubDict()->GetDictEntryNamesByCategory(); -} + + +// Probabely useless! + +//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()) @@ -168,30 +162,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, - std::string vr, - std::string fourth, - std::string name) +DictEntry *DictSet::NewVirtualDictEntry( uint16_t group, + uint16_t element, + TagName vr, + 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; @@ -199,10 +196,10 @@ DictEntry *DictSet::NewVirtualDictEntry(uint16_t group, /** * \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() { @@ -217,8 +214,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 +224,46 @@ std::string DictSet::BuildDictPath() 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 -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; } //-----------------------------------------------------------------------------