X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictSet.cxx;h=60f837e298c41d289f098b02b1fbd7c8f43244c5;hb=90034aefc764a5b6c4815c9073606d36956acab1;hp=d6a2fb7f4ca03158e8215045337ee51c9d4e2408;hpb=4b4569ba7d0829cf3782ff6b5bbe5ae1009466e6;p=gdcm.git diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx index d6a2fb7f..60f837e2 100644 --- a/src/gdcmDictSet.cxx +++ b/src/gdcmDictSet.cxx @@ -3,12 +3,12 @@ Program: gdcm Module: $RCSfile: gdcmDictSet.cxx,v $ Language: C++ - Date: $Date: 2004/08/01 02:39:09 $ - Version: $Revision: 1.34 $ + Date: $Date: 2005/02/05 01:37:08 $ + Version: $Revision: 1.60 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or - http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR @@ -21,31 +21,32 @@ #include #include // For getenv +namespace gdcm +{ + //----------------------------------------------------------------------------- // Constructor / Destructor /** - * \ingroup gdcmDictSet - * \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. */ -gdcmDictSet::gdcmDictSet() +DictSet::DictSet() { DictPath = BuildDictPath(); std::string pubDictFile(DictPath); pubDictFile += PUB_DICT_FILENAME; - Dicts[PUB_DICT_NAME] = new gdcmDict(pubDictFile); + Dicts[PUB_DICT_NAME] = new Dict(pubDictFile); } /** - * \ingroup gdcmDictSet * \brief Destructor */ -gdcmDictSet::~gdcmDictSet() +DictSet::~DictSet() { - // Remove dictionnaries + // Remove dictionaries for (DictSetHT::iterator tag = Dicts.begin(); tag != Dicts.end(); ++tag) { - gdcmDict *entryToDelete = tag->second; + Dict *entryToDelete = tag->second; if ( entryToDelete ) { delete entryToDelete; @@ -54,108 +55,36 @@ gdcmDictSet::~gdcmDictSet() } Dicts.clear(); - // Remove virtual dictionnary entries - std::map::iterator it; - for(it = VirtualEntry.begin(); it != VirtualEntry.end(); ++it) - { - gdcmDictEntry *entry = it->second; - if ( entry ) - { - delete entry; - } - it->second = NULL; - } -} - -//----------------------------------------------------------------------------- -// Print -/** - * \ingroup gdcmDictSet - * \brief Print, in an informal fashion, the list of all the dictionaries - * contained is this gdcmDictSet, along with their respective content. - * @param os Output stream used for printing. - */ -void gdcmDictSet::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 + VirtualEntry.clear(); } //----------------------------------------------------------------------------- // Public -/** - * \ingroup gdcmDictSet - * \brief Consider all the entries of the public dicom dictionnary. - * Build all list of all the tag names of all those entries. - * \sa gdcmDictSet::GetPubDictTagNamesByCategory - * @return A list of all entries of the public dicom dictionnary. - */ -std::list *gdcmDictSet::GetPubDictEntryNames() -{ - return GetDefaultPubDict()->GetDictEntryNames(); -} - -/** - * \ingroup gdcmDictSet - * \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. - */ -std::map > * - gdcmDictSet::GetPubDictEntryNamesByCategory() -{ - return GetDefaultPubDict()->GetDictEntryNamesByCategory(); -} - /** - * \ingroup gdcmDictSet * \brief Loads a dictionary from a specified file, and add it - * to already the existing ones contained in this gdcmDictSet. - * @param FileName Absolute or relative filename containing the + * to already the existing ones contained in this DictSet. + * @param filename Absolute or relative filename containing the * dictionary to load. - * @param Name Symbolic name that be used as identifier of the newly + * @param name Symbolic name that be used as identifier of the newly * created dictionary. */ -gdcmDict *gdcmDictSet::LoadDictFromFile(std::string const & fileName, - DictKey const & name) +Dict *DictSet::LoadDictFromFile(std::string const &filename, + DictKey const &name) { - gdcmDict *newDict = new gdcmDict(fileName); + Dict *newDict = new Dict(filename); AppendDict(newDict, name); return newDict; } /** - * \ingroup gdcmDictSet * \brief Retrieve the specified dictionary (when existing) from this - * gdcmDictSet. - * @param DictName The symbolic name of the searched dictionary. + * DictSet. + * @param dictName The symbolic name of the searched dictionary. * \result The retrieved dictionary. */ -gdcmDict *gdcmDictSet::GetDict(DictKey const & dictName) +Dict *DictSet::GetDict(DictKey const &dictName) { DictSetHT::iterator dict = Dicts.find(dictName); if(dict != Dicts.end()) @@ -166,52 +95,73 @@ gdcmDict *gdcmDictSet::GetDict(DictKey const & dictName) } /** - * \brief Retrieve the default reference DICOM V3 public dictionary. - * \result The retrieved default dictionary. - */ -gdcmDict *gdcmDictSet::GetDefaultPubDict() -{ - return GetDict(PUB_DICT_NAME); -} - -/** - * \brief Create a gdcmDictEntry which will be reference - * in no dictionnary + * \brief Create a DictEntry which will be referenced + * in no dictionary * @return virtual entry */ -gdcmDictEntry *gdcmDictSet::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) { - gdcmDictEntry* entry; - const std::string tag = gdcmDictEntry::TranslateToKey(group,element) - + "#" + vr + "#" + fourth + "#" + name; - std::map::iterator it; + DictEntry *entry; + const std::string tag = DictEntry::TranslateToKey(group,element) + + "#" + vr + "#" + vm + "#" + name; + TagKeyHT::iterator it; it = VirtualEntry.find(tag); if(it != VirtualEntry.end()) { - entry = it->second; + entry = &(it->second); } else { - entry = new gdcmDictEntry(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; } +/** + * \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 gdcmDictSet::BuildDictPath() +std::string DictSet::BuildDictPath() { std::string resultPath; const char *envPath = 0; @@ -224,8 +174,7 @@ std::string gdcmDictSet::BuildDictPath() { resultPath += '/'; } - dbg.Verbose(1, "gdcmDictSet::BuildDictPath:", - "Dictionary path set from environnement"); + gdcmWarningMacro( "Dictionary path set from environnement"); } else { @@ -237,16 +186,36 @@ std::string gdcmDictSet::BuildDictPath() //----------------------------------------------------------------------------- // Protected -bool gdcmDictSet::AppendDict(gdcmDict *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