X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictSet.h;h=4256ad8e3fc29defb1f33f0b6338ef1c05a3a42e;hb=cb4151f6e62f04656d529d3298757f11be09caaf;hp=751be5f83e208322cd4b9b57541dc182901ac51c;hpb=0457e1e8fc68df6d9e2d1a0fcd0053ecee3c5ad7;p=gdcm.git diff --git a/src/gdcmDictSet.h b/src/gdcmDictSet.h index 751be5f8..4256ad8e 100644 --- a/src/gdcmDictSet.h +++ b/src/gdcmDictSet.h @@ -3,18 +3,18 @@ #ifndef GDCMDICTSET_H #define GDCMDICTSET_H +#include "gdcmDict.h" #include #include -#include "gdcmDict.h" -typedef string DictKey; -typedef map DictSetHT; +typedef std::string DictKey; +typedef std::map DictSetHT; /* * \defgroup gdcmDictSet * \brief Container for managing a set of loaded dictionaries. * \note Hopefully, sharing dictionaries should avoid - * \par reloading an allready loaded dictionary (saving time) + * \par reloading an already loaded dictionary (saving time) * \par having many in memory representations of the same dictionary * (saving memory). */ @@ -23,24 +23,25 @@ private: /// Hash table of all dictionaries contained in this gdcmDictSet DictSetHT Dicts; /// Directory path to dictionaries - string DictPath; + std::string DictPath; int AppendDict(gdcmDict* NewDict); - void LoadDictFromFile(string filename, DictKey); - string BuildDictPath(void); + void LoadDictFromFile(std::string FileName, DictKey Name); + std::string BuildDictPath(void); public: - list * GetPubDictTagNames(void); - map >* GetPubDictTagNamesByCategory(void); + std::list * GetPubDictTagNames(void); + std::map >* + GetPubDictTagNamesByCategory(void); - // TODO Swig int LoadDictFromFile(string filename); + // TODO Swig int LoadDictFromFile(std::string filename); // QUESTION: the following function might not be thread safe !? Maybe // we need some mutex here, to avoid concurent creation of // the same dictionary !?!?! - // TODO Swig int LoadDictFromName(string filename); - // TODO Swig int LoadAllDictFromDirectory(string DirectoryName); - // TODO Swig string* GetAllDictNames(); + // TODO Swig int LoadDictFromName(std::string filename); + // TODO Swig int LoadAllDictFromDirectory(std::string DirectoryName); + // TODO Swig std::string* GetAllDictNames(); gdcmDictSet(void); ~gdcmDictSet(void); - void Print(ostream&); + void Print(std::ostream& os); gdcmDict* GetDict(DictKey DictName); gdcmDict* GetDefaultPubDict(void); };