X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictSet.h;h=895459d094903057916db82a368bb447deeaa0b3;hb=6fc40309997e3c20fc494201644a3e8094f0c971;hp=960296d6ac9ca0ee34ca8bb50cbef3e0149f1ff6;hpb=49c0af19f5bf0f2402d37d8abf7fb139e7453245;p=gdcm.git diff --git a/src/gdcmDictSet.h b/src/gdcmDictSet.h index 960296d6..895459d0 100644 --- a/src/gdcmDictSet.h +++ b/src/gdcmDictSet.h @@ -3,12 +3,12 @@ Program: gdcm Module: $RCSfile: gdcmDictSet.h,v $ Language: C++ - Date: $Date: 2004/08/01 00:59:21 $ - Version: $Revision: 1.22 $ + Date: $Date: 2004/10/18 02:17:07 $ + Version: $Revision: 1.28 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or - http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR @@ -23,60 +23,64 @@ #include #include +namespace gdcm +{ typedef std::string DictKey; -typedef std::map DictSetHT; +typedef std::map DictSetHT; //----------------------------------------------------------------------------- /* - * \defgroup gdcmDictSet + * \defgroup DictSet * \brief Container for managing a set of loaded dictionaries. * \note Hopefully, sharing dictionaries should avoid * \par reloading an already loaded dictionary (saving time) * \par having many in memory representations of the same dictionary * (saving memory). */ -class GDCM_EXPORT gdcmDictSet +class GDCM_EXPORT DictSet { 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(); + DictSet(); + ~DictSet(); void Print(std::ostream& os); - std::list *GetPubDictEntryNames(); - std::map > * - GetPubDictEntryNamesByCategory(); + EntryNamesList * GetPubDictEntryNames(); + EntryNamesByCatMap * GetPubDictEntryNamesByCategory(); + + Dict* LoadDictFromFile( std::string const & fileName, + DictKey const & name ); + + Dict* GetDict( DictKey const & DictName ); - gdcmDict *LoadDictFromFile(std::string FileName, DictKey Name); + /// \brief Retrieve the default reference DICOM V3 public dictionary. + Dict* GetDefaultPubDict() { return GetDict(PUB_DICT_NAME); }; - gdcmDict *GetDict(DictKey DictName); - gdcmDict *GetDefaultPubDict(); + // \brief Retrieve the virtual reference DICOM dictionary. + // \warning : not end user intended + // Dict* GetVirtualDict() { return &VirtualEntry; }; - gdcmDictEntry *NewVirtualDictEntry(uint16_t group, uint16_t element, - std::string vr = "Unknown", - std::string fourth = "Unknown", - std::string name = "Unknown"); + DictEntry* NewVirtualDictEntry(uint16_t group, uint16_t element, + TagName vr = "Unknown", + TagName fourth = "Unknown", + TagName name = "Unknown"); static std::string BuildDictPath(); protected: - bool AppendDict(gdcmDict *NewDict,DictKey Name); + bool AppendDict(Dict *NewDict, DictKey const & name); private: - /// Hash table of all dictionaries contained in this gdcmDictSet + /// Hash table of all dictionaries contained in this DictSet DictSetHT Dicts; + /// Directory path to dictionaries std::string DictPath; - /// H table for the on the fly created gdcmDictEntries - std::map virtualEntry; + + /// H table for the on the fly created DictEntries + TagKeyHT VirtualEntry; }; +} // end namespace gdcm //----------------------------------------------------------------------------- #endif