X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictSet.cxx;h=ce08aa50142d21fb238198ed7702901128d26a64;hb=06c1c583239fdf5196260e6ef83a78669c1bd17f;hp=c13cf1dfd991d6fb5b707e4b2c113b1952f56117;hpb=eb941e8785d3742b8a6a1aac964d43dcb4cf49f0;p=gdcm.git diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx index c13cf1df..ce08aa50 100644 --- a/src/gdcmDictSet.cxx +++ b/src/gdcmDictSet.cxx @@ -1,21 +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" -using namespace std; #define PUB_DICT_NAME "DicomV3Dict" #ifndef PUB_DICT_PATH @@ -23,6 +11,49 @@ using namespace std; #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() { + for (DictSetHT::iterator tag = Dicts.begin(); tag != Dicts.end(); ++tag) { + gdcmDict* EntryToDelete = tag->second; + if ( EntryToDelete ) + delete EntryToDelete; + } + Dicts.clear(); +} + +//----------------------------------------------------------------------------- +// 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. @@ -30,8 +61,8 @@ using namespace std; * \sa gdcmDictSet::GetPubDictTagNamesByCategory * @return A list of all entries of the public dicom dictionnary. */ -list * gdcmDictSet::GetPubDictTagNames(void) { - list * Result = new list; +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){ @@ -51,12 +82,21 @@ 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 >; +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){ @@ -65,48 +105,6 @@ map > * gdcmDictSet::GetPubDictTagNamesByCategory(void) { 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/". - */ -string gdcmDictSet::BuildDictPath(void) { - 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(); - 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(); -} - /** * \ingroup gdcmDictSet * \brief Loads a dictionary from a specified file, and add it @@ -116,29 +114,16 @@ gdcmDictSet::~gdcmDictSet() { * @param Name Symbolic name that be used as identifier of the newly * created dictionary. */ -void gdcmDictSet::LoadDictFromFile(string FileName, DictKey Name) { +void 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(ostream& os) { - for (DictSetHT::iterator dict = Dicts.begin(); dict != Dicts.end(); ++dict){ - os << "Printing dictionary " << dict->first << " \n"; - dict->second->Print(os); - } + AppendDict(NewDict,Name); } /** * \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) { @@ -154,3 +139,41 @@ gdcmDict * gdcmDictSet::GetDict(DictKey DictName) { gdcmDict * gdcmDictSet::GetDefaultPubDict() { return GetDict(PUB_DICT_NAME); } + +/** + * \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 + +//----------------------------------------------------------------------------- + +