X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictSet.cxx;h=d6a2fb7f4ca03158e8215045337ee51c9d4e2408;hb=7815fe9dc3532b716dc478ca0f255263f99d296f;hp=82962d6e677c05291a608b1b4fa82d0f1f4203e9;hpb=1e74cf45bc96f14c342cc404f0f91dfffe0810b9;p=gdcm.git diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx index 82962d6e..d6a2fb7f 100644 --- a/src/gdcmDictSet.cxx +++ b/src/gdcmDictSet.cxx @@ -1,16 +1,26 @@ -// gdcmDictEntry -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmDictSet.cxx,v $ + Language: C++ + Date: $Date: 2004/08/01 02:39:09 $ + Version: $Revision: 1.34 $ + + 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. + + 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" - //----------------------------------------------------------------------------- // Constructor / Destructor /** @@ -18,11 +28,12 @@ * \brief The Dictionnary Set obtained with this constructor simply * contains the Default Public dictionnary. */ -gdcmDictSet::gdcmDictSet(void) +gdcmDictSet::gdcmDictSet() { DictPath = BuildDictPath(); - std::string PubDictFile = DictPath + PUB_DICT_FILENAME; - Dicts[PUB_DICT_NAME] = new gdcmDict(PubDictFile); + std::string pubDictFile(DictPath); + pubDictFile += PUB_DICT_FILENAME; + Dicts[PUB_DICT_NAME] = new gdcmDict(pubDictFile); } /** @@ -34,21 +45,25 @@ gdcmDictSet::~gdcmDictSet() // Remove dictionnaries for (DictSetHT::iterator tag = Dicts.begin(); tag != Dicts.end(); ++tag) { - gdcmDict *EntryToDelete = tag->second; - if ( EntryToDelete ) - delete EntryToDelete; - tag->second=NULL; + gdcmDict *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) + for(it = VirtualEntry.begin(); it != VirtualEntry.end(); ++it) { - gdcmDictEntry *Entry = it->second; - if ( Entry ) - delete Entry; - it->second=NULL; + gdcmDictEntry *entry = it->second; + if ( entry ) + { + delete entry; + } + it->second = NULL; } } @@ -75,41 +90,44 @@ void gdcmDictSet::Print(std::ostream& os) * \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 + * \sa gdcmDictSet::GetPubDictTagNamesByCategory * @return A list of all entries of the public dicom dictionnary. */ -std::list *gdcmDictSet::GetPubDictTagNames(void) +std::list *gdcmDictSet::GetPubDictEntryNames() { - return(GetDefaultPubDict()->GetTagNames()); + 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' + * \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 > * + gdcmDictSet::GetPubDictEntryNamesByCategory() { - return(GetDefaultPubDict()->GetTagNamesByCategory()); + return GetDefaultPubDict()->GetDictEntryNamesByCategory(); } /** @@ -121,10 +139,13 @@ std::map > *gdcmDictSet::GetPubDictTagNamesB * @param Name Symbolic name that be used as identifier of the newly * created dictionary. */ -void gdcmDictSet::LoadDictFromFile(std::string FileName, DictKey Name) +gdcmDict *gdcmDictSet::LoadDictFromFile(std::string const & fileName, + DictKey const & name) { - gdcmDict *NewDict = new gdcmDict(FileName); - AppendDict(NewDict,Name); + gdcmDict *newDict = new gdcmDict(fileName); + AppendDict(newDict, name); + + return newDict; } /** @@ -134,16 +155,17 @@ void gdcmDictSet::LoadDictFromFile(std::string FileName, DictKey Name) * @param DictName The symbolic name of the searched dictionary. * \result The retrieved dictionary. */ -gdcmDict *gdcmDictSet::GetDict(DictKey DictName) +gdcmDict *gdcmDictSet::GetDict(DictKey const & dictName) { - DictSetHT::iterator dict = Dicts.find(DictName); - if(dict!=Dicts.end()) + DictSetHT::iterator dict = Dicts.find(dictName); + if(dict != Dicts.end()) + { return dict->second; + } return NULL; } /** - * \ingroup gdcmDictSet * \brief Retrieve the default reference DICOM V3 public dictionary. * \result The retrieved default dictionary. */ @@ -153,64 +175,73 @@ gdcmDict *gdcmDictSet::GetDefaultPubDict() } /** - * \ingroup gdcmDictSet * \brief Create a gdcmDictEntry which will be reference * in no dictionnary * @return virtual entry */ -gdcmDictEntry *gdcmDictSet::NewVirtualDictEntry(guint16 group, guint16 element, - std::string vr,std::string fourth, +gdcmDictEntry *gdcmDictSet::NewVirtualDictEntry(uint16_t group, + uint16_t element, + std::string vr, + std::string fourth, std::string name) { - gdcmDictEntry *entry; - std::string tag=gdcmDictEntry::TranslateToKey(group,element)+vr; + gdcmDictEntry* entry; + const std::string tag = gdcmDictEntry::TranslateToKey(group,element) + + "#" + vr + "#" + fourth + "#" + name; std::map::iterator it; - it=virtualEntry.find(tag); - if(it!=virtualEntry.end()) + 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; + entry = new gdcmDictEntry(group, element, vr, fourth, name); + VirtualEntry[tag] = entry; } - return(entry); + + return entry; } /** - * \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 */ -std::string gdcmDictSet::BuildDictPath(void) +std::string gdcmDictSet::BuildDictPath() { - std::string ResultPath; - const char *EnvPath = (char*)0; - EnvPath = getenv("GDCM_DICT_PATH"); - if (EnvPath && (strlen(EnvPath) != 0)) + 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 += '/'; + 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; + { + resultPath = PUB_DICT_PATH; + } + + return resultPath; } //----------------------------------------------------------------------------- // Protected -bool gdcmDictSet::AppendDict(gdcmDict *NewDict,DictKey Name) +bool gdcmDictSet::AppendDict(gdcmDict *newDict, DictKey const & name) { - Dicts[Name] = NewDict; - return(true); + Dicts[name] = newDict; + + return true; //FIXME } //-----------------------------------------------------------------------------