X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictSet.cxx;h=518eb728deebc892d337aa7d1ef36aa6d573c582;hb=4a07b1470f68d316f570fef1f07b9f9c77e90ee1;hp=3306b73d3ea6a1da0f4adf462fd60fabc5382bcd;hpb=9a20ecd3e79d8f14e4d4102955b6f26463c1c0cd;p=gdcm.git diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx index 3306b73d..518eb728 100644 --- a/src/gdcmDictSet.cxx +++ b/src/gdcmDictSet.cxx @@ -1,20 +1,9 @@ // gdcmDictEntry - -#ifdef _MSC_VER -//'identifier' : decorated name length exceeded, name was truncated -//#pragma warning ( disable : 4503 ) -// 'identifier' : class 'type' needs to have dll-interface to be used by -// clients of class 'type2' -#pragma warning ( disable : 4251 ) -// 'identifier' : identifier was truncated to 'number' characters in the -// debug information -#pragma warning ( disable : 4786 ) -#endif //_MSC_VER - +//----------------------------------------------------------------------------- +#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 @@ -22,6 +11,66 @@ #endif #define PUB_DICT_FILENAME "dicomV3.dic" +//----------------------------------------------------------------------------- +// 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. @@ -29,14 +78,9 @@ * \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()); } /** @@ -55,64 +99,17 @@ std::list * gdcmDictSet::GetPubDictTagNames(void) { * - 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 od thhe dictionnary + * 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::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; -} - -/** - * \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/". - */ -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; -} - -/** - * \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); -} - -gdcmDictSet::~gdcmDictSet() { - for (DictSetHT::iterator tag = Dicts.begin(); tag != Dicts.end(); ++tag) { - gdcmDict* EntryToDelete = tag->second; - if ( EntryToDelete ) - delete EntryToDelete; - } - Dicts.clear(); +std::map > *gdcmDictSet::GetPubDictEntryNamesByCategory(void) +{ + return(GetDefaultPubDict()->GetDictEntryNamesByCategory()); } /** @@ -124,34 +121,26 @@ gdcmDictSet::~gdcmDictSet() { * @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); - Dicts[Name] = NewDict; -} - -/** - * \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); - } + AppendDict(NewDict,Name); + return(NewDict); } /** * \ingroup gdcmDictSet * \brief Retrieve the specified dictionary (when existing) from this * gdcmDictSet. - * @param DictName The synbolic name of the searched dictionary. + * @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; } /** @@ -159,6 +148,75 @@ gdcmDict * gdcmDictSet::GetDict(DictKey DictName) { * \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(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(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 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; +} + +//----------------------------------------------------------------------------- +// Protected +bool gdcmDictSet::AppendDict(gdcmDict *NewDict,DictKey Name) +{ + Dicts[Name] = NewDict; + return(true); +} + +//----------------------------------------------------------------------------- +// Private + +//----------------------------------------------------------------------------- + +