X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictSet.cxx;h=e03a01a4d242b372d6ce2ec6f34ea09e06ecb99a;hb=5bf7c51796867388334836847a6874640bc83f89;hp=0db5964ad2266f0f2058fddff523a4d9be211fbd;hpb=5a6910a313a526514242a21b868c7186fca14168;p=gdcm.git diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx index 0db5964a..e03a01a4 100644 --- a/src/gdcmDictSet.cxx +++ b/src/gdcmDictSet.cxx @@ -1,160 +1,245 @@ -// gdcmDictEntry +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmDictSet.cxx,v $ + Language: C++ + Date: $Date: 2004/10/20 14:30:40 $ + Version: $Revision: 1.41 $ + + 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.html for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ #include "gdcmDictSet.h" -#include "gdcmUtil.h" +#include "gdcmDebug.h" #include #include // For getenv -#define PUB_DICT_NAME "DicomV3Dict" -#ifndef PUB_DICT_PATH -# define PUB_DICT_PATH "../Dicts/" -#endif -#define PUB_DICT_FILENAME "dicomV3.dic" +namespace gdcm +{ +//----------------------------------------------------------------------------- +// Constructor / Destructor /** - * \ingroup gdcmDictSet + * \ingroup DictSet + * \brief The Dictionnary Set obtained with this constructor simply + * contains the Default Public dictionnary. + */ +DictSet::DictSet() +{ + DictPath = BuildDictPath(); + std::string pubDictFile(DictPath); + pubDictFile += PUB_DICT_FILENAME; + Dicts[PUB_DICT_NAME] = new Dict(pubDictFile); +} + +/** + * \ingroup DictSet + * \brief Destructor + */ +DictSet::~DictSet() +{ + // Remove dictionnaries + for (DictSetHT::iterator tag = Dicts.begin(); tag != Dicts.end(); ++tag) + { + Dict *entryToDelete = tag->second; + if ( entryToDelete ) + { + delete entryToDelete; + } + tag->second = NULL; + } + 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); + } +} + +//----------------------------------------------------------------------------- +// 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 gdcmDictSet::GetPubDictTagNamesByCategory + * \sa DictSet::GetPubDictTagNamesByCategory * @return A list of all entries of the public dicom dictionnary. */ -std::list * gdcmDictSet::GetPubDictTagNames(void) { - std::list * Result = new std::list; - TagKeyHT entries = GetDefaultPubDict()->GetEntries(); - - for (TagKeyHT::iterator tag = entries.begin(); tag != entries.end(); ++tag){ - Result->push_back( tag->second->GetName() ); - } - return Result; +EntryNamesList * DictSet::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' + * \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 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 :-( + * - 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::GetPubDictTagNamesByCategory(void) { - std::map > * Result = new std::map >; - TagKeyHT entries = GetDefaultPubDict()->GetEntries(); - - for (TagKeyHT::iterator tag = entries.begin(); tag != entries.end(); ++tag){ - (*Result)[tag->second->GetFourth()].push_back(tag->second->GetName()); - } - return Result; +EntryNamesByCatMap * DictSet::GetPubDictEntryNamesByCategory() +{ + return GetDefaultPubDict()->GetDictEntryNamesByCategory(); } /** - * \ingroup gdcmDictSet - * \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 + * \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 + * dictionary to load. + * @param name Symbolic name that be used as identifier of the newly + * created dictionary. */ -std::string gdcmDictSet::BuildDictPath(void) { - std::string ResultPath; - const char* EnvPath = (char*)0; - EnvPath = getenv("GDCM_DICT_PATH"); - if (EnvPath && (strlen(EnvPath) != 0)) { - ResultPath = EnvPath; - if (ResultPath[ResultPath.length() -1] != '/' ) - ResultPath += '/'; - dbg.Verbose(1, "gdcmDictSet::BuildDictPath:", - "Dictionary path set from environnement"); - } else - ResultPath = PUB_DICT_PATH; - return ResultPath; -} +Dict *DictSet::LoadDictFromFile(std::string const & filename, + DictKey const & name) +{ + Dict *newDict = new Dict(filename); + AppendDict(newDict, name); -/** - * \ingroup gdcmDictSet - * \brief The Dictionnary Set obtained with this constructor simply - * contains the Default Public dictionnary. - */ -gdcmDictSet::gdcmDictSet(void) { - DictPath = BuildDictPath(); - std::string PubDictFile = DictPath + PUB_DICT_FILENAME; - Dicts[PUB_DICT_NAME] = new gdcmDict(PubDictFile); + return newDict; } - /** - * \ingroup gdcmDictSet - * \brief Destructor + * \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. */ -gdcmDictSet::~gdcmDictSet() { - for (DictSetHT::iterator tag = Dicts.begin(); tag != Dicts.end(); ++tag) { - gdcmDict* EntryToDelete = tag->second; - if ( EntryToDelete ) - delete EntryToDelete; +Dict *DictSet::GetDict(DictKey const & dictName) +{ + DictSetHT::iterator dict = Dicts.find(dictName); + if(dict != Dicts.end()) + { + return dict->second; } - Dicts.clear(); + return NULL; } /** - * \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 - * dictionary to load. - * @param Name Symbolic name that be used as identifier of the newly - * created dictionary. + * \brief Create a DictEntry which will be reference + * in no dictionnary + * @return virtual entry */ -void gdcmDictSet::LoadDictFromFile(std::string FileName, DictKey Name) { - gdcmDict *NewDict = new gdcmDict(FileName); - Dicts[Name] = NewDict; +DictEntry *DictSet::NewVirtualDictEntry( uint16_t group, + uint16_t element, + TagName vr, + TagName fourth, + TagName name) +{ + DictEntry* entry; + const std::string tag = DictEntry::TranslateToKey(group,element) + + "#" + vr + "#" + fourth + "#" + name; + std::map::iterator it; + + it = VirtualEntry.find(tag); + if(it != VirtualEntry.end()) + { + entry = it->second; + } + else + { + entry = new DictEntry(group, element, vr, fourth, name); + VirtualEntry[tag] = entry; + } + + return entry; } /** - * \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. + * \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 */ -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); +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 += '/'; + } + dbg.Verbose(1, "DictSet::BuildDictPath:", + "Dictionary path set from environnement"); + } + else + { + resultPath = PUB_DICT_PATH; } -} -/** - * \ingroup gdcmDictSet - * \brief Retrieve the specified dictionary (when existing) from this - * gdcmDictSet. - * @param DictName The symbolic name of the searched dictionary. - * \result The retrieved dictionary. - */ -gdcmDict * gdcmDictSet::GetDict(DictKey DictName) { - DictSetHT::iterator dict = Dicts.find(DictName); - return dict->second; + return resultPath; } -/** - * \ingroup gdcmDictSet - * \brief Retrieve the default reference DICOM V3 public dictionary. - * \result The retrieved default dictionary. - */ -gdcmDict * gdcmDictSet::GetDefaultPubDict() { - return GetDict(PUB_DICT_NAME); +//----------------------------------------------------------------------------- +// Protected +bool DictSet::AppendDict(Dict *newDict, DictKey const & name) +{ + Dicts[name] = newDict; + + return true; //FIXME } + +//----------------------------------------------------------------------------- +// Private + +//----------------------------------------------------------------------------- + +} // end namespace gdcm