X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmDictSet.cxx;h=c26768c0861ad86e8f7cd9edd2a3499f8fb9a490;hb=4c8c80589b3770976ea27fc03b290b97db5da3e6;hp=ce08aa50142d21fb238198ed7702901128d26a64;hpb=06c1c583239fdf5196260e6ef83a78669c1bd17f;p=gdcm.git diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx index ce08aa50..c26768c0 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/07/02 13:55:27 $ + Version: $Revision: 1.32 $ + + 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,9 +28,11 @@ * \brief The Dictionnary Set obtained with this constructor simply * contains the Default Public dictionnary. */ -gdcmDictSet::gdcmDictSet(void) { +gdcmDictSet::gdcmDictSet(void) +{ DictPath = BuildDictPath(); - std::string PubDictFile = DictPath + PUB_DICT_FILENAME; + std::string PubDictFile(DictPath); + PubDictFile += PUB_DICT_FILENAME; /// MEMORY LEAK std::string::operator+= Dicts[PUB_DICT_NAME] = new gdcmDict(PubDictFile); } @@ -28,13 +40,27 @@ gdcmDictSet::gdcmDictSet(void) { * \ingroup gdcmDictSet * \brief Destructor */ -gdcmDictSet::~gdcmDictSet() { - for (DictSetHT::iterator tag = Dicts.begin(); tag != Dicts.end(); ++tag) { - gdcmDict* EntryToDelete = tag->second; +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; } 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; + } } //----------------------------------------------------------------------------- @@ -45,8 +71,10 @@ gdcmDictSet::~gdcmDictSet() { * 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){ +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); } @@ -58,51 +86,43 @@ 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 * 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; +std::list *gdcmDictSet::GetPubDictEntryNames(void) +{ + 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 > * 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; +std::map > *gdcmDictSet::GetPubDictEntryNamesByCategory(void) +{ + return(GetDefaultPubDict()->GetDictEntryNamesByCategory()); } /** @@ -114,9 +134,11 @@ std::map > * gdcmDictSet::GetPubDictTagNames * @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 FileName, DictKey Name) +{ gdcmDict *NewDict = new gdcmDict(FileName); AppendDict(NewDict,Name); + return(NewDict); } /** @@ -126,46 +148,80 @@ 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 DictName) +{ DictSetHT::iterator dict = Dicts.find(DictName); - return dict->second; + 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. */ -gdcmDict * gdcmDictSet::GetDefaultPubDict() { +gdcmDict *gdcmDictSet::GetDefaultPubDict() +{ return GetDict(PUB_DICT_NAME); } /** - * \ingroup gdcmDictSet + * \brief Create a gdcmDictEntry which will be reference + * in no dictionnary + * @return virtual entry + */ +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 + "#" + fourth + "#" + name; + std::map::iterator it; + + it=virtualEntry.find(tag); + if(it!=virtualEntry.end()) + { + entry=it->second; + } + else + { + entry=new gdcmDictEntry(group,element,vr,fourth,name); + virtualEntry[tag]=entry; + } + return(entry); +} + +/** * \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 + * @return path to directory containing the dictionnaries */ -std::string gdcmDictSet::BuildDictPath(void) { +std::string gdcmDictSet::BuildDictPath(void) +{ std::string ResultPath; - const char* EnvPath = (char*)0; + const char *EnvPath = (char*)0; EnvPath = getenv("GDCM_DICT_PATH"); - if (EnvPath && (strlen(EnvPath) != 0)) { + if (EnvPath && (strlen(EnvPath) != 0)) + { ResultPath = EnvPath; if (ResultPath[ResultPath.length() -1] != '/' ) ResultPath += '/'; dbg.Verbose(1, "gdcmDictSet::BuildDictPath:", "Dictionary path set from environnement"); - } else + } + else ResultPath = PUB_DICT_PATH; return ResultPath; } //----------------------------------------------------------------------------- // Protected -bool gdcmDictSet::AppendDict(gdcmDict* NewDict,DictKey Name) +bool gdcmDictSet::AppendDict(gdcmDict *NewDict,DictKey Name) { Dicts[Name] = NewDict; return(true);