X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictSet.cxx;h=518eb728deebc892d337aa7d1ef36aa6d573c582;hb=b26e20f5faabeaebef8992f5a364fa1d5561bd08;hp=41a39c3f6ac9a2cb5b14fbb24e169a9216bde05e;hpb=565a47ec4e037897aaf770aeccc5d67d7ad7b478;p=gdcm.git diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx index 41a39c3f..518eb728 100644 --- a/src/gdcmDictSet.cxx +++ b/src/gdcmDictSet.cxx @@ -1,9 +1,9 @@ // gdcmDictEntry - +//----------------------------------------------------------------------------- +#include "gdcmDictSet.h" +#include "gdcmUtil.h" #include #include // For getenv -#include "gdcmUtil.h" -#include "gdcmDictSet.h" #define PUB_DICT_NAME "DicomV3Dict" #ifndef PUB_DICT_PATH @@ -11,9 +11,66 @@ #endif #define PUB_DICT_FILENAME "dicomV3.dic" -string gdcmDictSet::DictPath = gdcmDictSet::BuildDictPath(); -gdcmDict* gdcmDictSet::DefaultPubDict = gdcmDictSet::LoadDefaultPubDict(); +//----------------------------------------------------------------------------- +// Constructor / Destructor +/** + * \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); +} + +/** + * \ingroup gdcmDictSet + * \brief Destructor + */ +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; + } +} + +//----------------------------------------------------------------------------- +// 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); + } +} +//----------------------------------------------------------------------------- +// Public /** * \ingroup gdcmDictSet * \brief Consider all the entries of the public dicom dictionnary. @@ -21,14 +78,9 @@ gdcmDict* gdcmDictSet::DefaultPubDict = gdcmDictSet::LoadDefaultPubDict(); * \sa gdcmDictSet::GetPubDictTagNamesByCategory * @return A list of all entries of the public dicom dictionnary. */ -list * gdcmDictSet::GetPubDictTagNames(void) { - list * Result = new list; - TagKeyHT entries = gdcmDictSet::DefaultPubDict->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()); } /** @@ -42,18 +94,90 @@ list * gdcmDictSet::GetPubDictTagNames(void) { * 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. */ -map > * gdcmDictSet::GetPubDictTagNamesByCategory(void) { - map > * Result = new map >; - TagKeyHT entries = gdcmDictSet::DefaultPubDict->GetEntries(); +std::map > *gdcmDictSet::GetPubDictEntryNamesByCategory(void) +{ + 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 + * dictionary to load. + * @param Name Symbolic name that be used as identifier of the newly + * created dictionary. + */ +gdcmDict *gdcmDictSet::LoadDictFromFile(std::string FileName, DictKey Name) +{ + gdcmDict *NewDict = new gdcmDict(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. + * \result The retrieved dictionary. + */ +gdcmDict *gdcmDictSet::GetDict(DictKey DictName) +{ + 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. + */ +gdcmDict *gdcmDictSet::GetDefaultPubDict() +{ + return GetDict(PUB_DICT_NAME); +} - for (TagKeyHT::iterator tag = entries.begin(); tag != entries.end(); ++tag){ - (*Result)[tag->second->GetFourth()].push_back(tag->second->GetName()); +/** + * \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, + 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 Result; + return(entry); } /** @@ -62,53 +186,37 @@ map > * gdcmDictSet::GetPubDictTagNamesByCategory(void) { * 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 */ -string gdcmDictSet::BuildDictPath(void) { - string ResultPath; - const char* EnvPath = (char*)0; +std::string gdcmDictSet::BuildDictPath(void) +{ + std::string ResultPath; + 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; } -gdcmDict* gdcmDictSet::LoadDefaultPubDict(void) { - string PubDictFile = gdcmDictSet::DictPath + PUB_DICT_FILENAME; - return new gdcmDict(PubDictFile.c_str()); -} - -/** - * \ingroup gdcmDictSet - * \brief The Dictionnary Set obtained with this constructor simply - * contains the Default Public dictionnary. - */ -gdcmDictSet::gdcmDictSet(void) { - dicts[PUB_DICT_NAME] = DefaultPubDict; +//----------------------------------------------------------------------------- +// Protected +bool gdcmDictSet::AppendDict(gdcmDict *NewDict,DictKey Name) +{ + Dicts[Name] = NewDict; + return(true); } -void gdcmDictSet::LoadDictFromFile(string FileName, DictKey Name) { - gdcmDict *NewDict = new gdcmDict(FileName.c_str()); - dicts[Name] = NewDict; -} +//----------------------------------------------------------------------------- +// Private -void gdcmDictSet::Print(ostream& os) { - for (DictSetHT::iterator dict = dicts.begin(); dict != dicts.end(); ++dict){ - os << "Printing dictionary " << dict->first << " \n"; - dict->second->Print(os); - } -} +//----------------------------------------------------------------------------- -gdcmDict * gdcmDictSet::GetDict(DictKey DictName) { - DictSetHT::iterator dict = dicts.find(DictName); - return dict->second; -} -gdcmDict * gdcmDictSet::GetDefaultPubDict() { - return GetDict(PUB_DICT_NAME); -}