X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictSet.h;h=e970b80bc899c89117f550cc6ba17c33130a5d23;hb=9b3db5f141ec2b11eadefaa2ea2a3a20058b37f9;hp=c57ae16603bf1a34ee17a0e21ce150f880fee1d6;hpb=541ed5b2824ff14630565a474b1406e58b677662;p=gdcm.git diff --git a/src/gdcmDictSet.h b/src/gdcmDictSet.h index c57ae166..e970b80b 100644 --- a/src/gdcmDictSet.h +++ b/src/gdcmDictSet.h @@ -1,50 +1,65 @@ // gdcmDictSet.h - +//----------------------------------------------------------------------------- #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). */ class GDCM_EXPORT gdcmDictSet { -private: - DictSetHT dicts; - int AppendDict(gdcmDict* NewDict); - void LoadDictFromFile(string filename, DictKey); -private: - /// Directory path to dictionaries - static string DictPath; - static string BuildDictPath(void); - static gdcmDict* DefaultPubDict; public: - static list * GetPubDictTagNames(void); - static map >* GetPubDictTagNamesByCategory(void); - static gdcmDict* LoadDefaultPubDict(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(); - gdcmDictSet(void); - ~gdcmDictSet(void); - void Print(ostream&); - gdcmDict* GetDict(DictKey DictName); - gdcmDict* GetDefaultPubDict(void); + // 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(std::ostream& os); + + std::list *GetPubDictEntryNames(void); + std::map > * + GetPubDictEntryNamesByCategory(void); + + gdcmDict *LoadDictFromFile(std::string FileName, DictKey Name); + + gdcmDict *GetDict(DictKey DictName); + gdcmDict *GetDefaultPubDict(void); + + gdcmDictEntry *NewVirtualDictEntry(guint16 group, guint16 element, + std::string vr = "Unknown", + std::string fourth = "Unknown", + std::string name = "Unknown"); + + static std::string BuildDictPath(void); + +protected: + bool AppendDict(gdcmDict *NewDict,DictKey Name); + +private: + /// Hash table of all dictionaries contained in this gdcmDictSet + DictSetHT Dicts; + /// Directory path to dictionaries + std::string DictPath; + + std::map virtualEntry; }; +//----------------------------------------------------------------------------- #endif