Correction of previous commit. Sorry. --- Frog.

[gdcm.git] / src / gdcmDictSet.h

diff --git a/src/gdcmDictSet.h b/src/gdcmDictSet.h
index 0e2aed0b3a39a207fc4c6dface09f26b3f28b9fd..751be5f83e208322cd4b9b57541dc182901ac51c 100644 (file)
--- a/src/gdcmDictSet.h
+++ b/src/gdcmDictSet.h
@@ -5,33 +5,32 @@
 
 #include <map>
 #include <list>
-#include "gdcmCommon.h"
 #include "gdcmDict.h"
 
-////////////////////////////////////////////////////////////////////////////
-// Container for managing a set of loaded dictionaries. Sharing dictionaries
-// should avoid :
-// * reloading an allready loaded dictionary,
-// * having many in memory representations of the same dictionary.
-
 typedef string DictKey;
 typedef map<DictKey, gdcmDict*> 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    having many in memory representations of the same dictionary
+ *        (saving memory).
+ */
 class GDCM_EXPORT gdcmDictSet {
 private:
-       DictSetHT dicts;
+   /// Hash table of all dictionaries contained in this gdcmDictSet
+       DictSetHT Dicts;
+   /// Directory path to dictionaries
+       string DictPath;
        int AppendDict(gdcmDict* NewDict);
        void LoadDictFromFile(string filename, DictKey);
-private:
-       static string DictPath;      // Directory path to dictionaries
-       static string BuildDictPath(void);
-       static gdcmDict* DefaultPubDict;
+       string BuildDictPath(void);
 public:
-       static list<string> * GetPubDictTagNames(void);
-       static map<string, list<string> >* GetPubDictTagNamesByCategory(void);
-       static gdcmDict* LoadDefaultPubDict(void);
+       list<string> * GetPubDictTagNames(void);
+       map<string, list<string> >* GetPubDictTagNamesByCategory(void);
 
-       gdcmDictSet(void);
        // TODO Swig int LoadDictFromFile(string filename);
    // QUESTION: the following function might not be thread safe !? Maybe
    //           we need some mutex here, to avoid concurent creation of
@@ -39,7 +38,8 @@ public:
        // 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);