X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmDictSet.h;h=1cd5b0d91433ccfb2508b4bf3e00486e0a05aa56;hb=f6dbab059809959b586408f89330264a03cfe656;hp=960296d6ac9ca0ee34ca8bb50cbef3e0149f1ff6;hpb=49c0af19f5bf0f2402d37d8abf7fb139e7453245;p=gdcm.git diff --git a/src/gdcmDictSet.h b/src/gdcmDictSet.h index 960296d6..1cd5b0d9 100644 --- a/src/gdcmDictSet.h +++ b/src/gdcmDictSet.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDictSet.h,v $ Language: C++ - Date: $Date: 2004/08/01 00:59:21 $ - Version: $Revision: 1.22 $ + Date: $Date: 2004/08/03 17:28:59 $ + Version: $Revision: 1.24 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -38,28 +38,22 @@ typedef std::map DictSetHT; class GDCM_EXPORT gdcmDictSet { public: - // 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(std::string filename); - // TODO Swig int LoadAllDictFromDirectory(std::string DirectoryName); - // TODO Swig std::string* GetAllDictNames(); gdcmDictSet(); ~gdcmDictSet(); void Print(std::ostream& os); - std::list *GetPubDictEntryNames(); + std::list* GetPubDictEntryNames(); std::map > * GetPubDictEntryNamesByCategory(); - gdcmDict *LoadDictFromFile(std::string FileName, DictKey Name); + gdcmDict* LoadDictFromFile( std::string const & fileName, + DictKey const & name ); - gdcmDict *GetDict(DictKey DictName); - gdcmDict *GetDefaultPubDict(); + gdcmDict* GetDict( DictKey const & DictName ); + gdcmDict* GetDefaultPubDict(); - gdcmDictEntry *NewVirtualDictEntry(uint16_t group, uint16_t element, + gdcmDictEntry* NewVirtualDictEntry(uint16_t group, uint16_t element, std::string vr = "Unknown", std::string fourth = "Unknown", std::string name = "Unknown"); @@ -67,7 +61,7 @@ public: static std::string BuildDictPath(); protected: - bool AppendDict(gdcmDict *NewDict,DictKey Name); + bool AppendDict(gdcmDict *NewDict, DictKey const & name); private: /// Hash table of all dictionaries contained in this gdcmDictSet @@ -75,7 +69,7 @@ private: /// Directory path to dictionaries std::string DictPath; /// H table for the on the fly created gdcmDictEntries - std::map virtualEntry; + std::map VirtualEntry; }; //-----------------------------------------------------------------------------