X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictSet.h;h=9e2e2d777580a759e99c168c6a4d5d67d0e32a82;hb=80075429b6ab9db9e885b9bb9ae1427530c7bef8;hp=e49e859eb35924669fe10eb9c8fe37269fa9c38e;hpb=6b51b22366f878e1050c75a6ebb755bd2ff365c7;p=gdcm.git diff --git a/src/gdcmDictSet.h b/src/gdcmDictSet.h index e49e859e..9e2e2d77 100644 --- a/src/gdcmDictSet.h +++ b/src/gdcmDictSet.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDictSet.h,v $ Language: C++ - Date: $Date: 2005/10/25 14:52:34 $ - Version: $Revision: 1.49 $ + Date: $Date: 2007/08/22 16:14:04 $ + Version: $Revision: 1.55 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -16,16 +16,17 @@ =========================================================================*/ -#ifndef GDCMDICTSET_H -#define GDCMDICTSET_H +#ifndef _GDCMDICTSET_H +#define _GDCMDICTSET_H #include "gdcmRefCounter.h" #include "gdcmDict.h" +#include "gdcmGlobal.h" #include #include -namespace gdcm +namespace GDCM_NAME_SPACE { //----------------------------------------------------------------------------- typedef std::map DictSetHT; @@ -34,8 +35,8 @@ typedef std::map DictSetHT; /** * \brief Container for managing a set of loaded dictionaries (Dict). * \note Hopefully, sharing dictionaries should avoid - * \par reloading an already loaded dictionary (saving time) - * \par having many in memory representations of the same dictionary + * - reloading an already loaded dictionary (saving time) + * - having many in memory representations of the same dictionary * (saving memory). */ class GDCM_EXPORT DictSet : public RefCounter @@ -43,6 +44,7 @@ class GDCM_EXPORT DictSet : public RefCounter gdcmTypeMacro(DictSet); public: +/// \brief Contructs a DictSet with a RefCounter static DictSet *New() {return new DictSet();} void Print(std::ostream &os = std::cout, std::string const &indent = "" ); @@ -57,8 +59,9 @@ public: Dict *GetDict( DictKey const &DictName ); /// \brief Returns the default reference DICOM V3 public dictionary. - Dict* GetDefaultPubDict() { return GetDict(PUB_DICT_NAME); } - + //Dict* GetDefaultPubDict() { return GetDict(PUB_DICT_NAME); } + Dict* GetDefaultPubDict() { return Global::DefaultPubDict; } + // \ brief Returns the virtual references DICOM dictionary. // \ warning : not end user intended // Dict *GetVirtualDict() { return &VirtualEntries; }