X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictSet.h;h=1fee82f95158b3c06f0559db18b292c5b79751ab;hb=74898aac8bf30b29bb0e33a3e74d0f5a0b71518e;hp=0e2aed0b3a39a207fc4c6dface09f26b3f28b9fd;hpb=565a47ec4e037897aaf770aeccc5d67d7ad7b478;p=gdcm.git

diff --git a/src/gdcmDictSet.h b/src/gdcmDictSet.h
index 0e2aed0b..1fee82f9 100644
--- a/src/gdcmDictSet.h
+++ b/src/gdcmDictSet.h
@@ -1,48 +1,58 @@
 // gdcmDictSet.h
-
+//-----------------------------------------------------------------------------
 #ifndef GDCMDICTSET_H
 #define GDCMDICTSET_H
 
+#include "gdcmDict.h"
 #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;
+typedef std::string DictKey;
+typedef std::map<DictKey, gdcmDict*> DictSetHT;
 
+//-----------------------------------------------------------------------------
+/*
+ * \defgroup gdcmDictSet
+ * \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 {
-private:
-	DictSetHT dicts;
-	int AppendDict(gdcmDict* NewDict);
-	void LoadDictFromFile(string filename, DictKey);
-private:
-	static string DictPath;      // Directory path to dictionaries
-	static string BuildDictPath(void);
-	static gdcmDict* DefaultPubDict;
 public:
-	static list<string> * GetPubDictTagNames(void);
-	static map<string, list<string> >* GetPubDictTagNamesByCategory(void);
-	static gdcmDict* LoadDefaultPubDict(void);
-
-	gdcmDictSet(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();
-	//
-	void Print(ostream&);
-	gdcmDict* GetDict(DictKey DictName);
+	// 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<std::string> * GetPubDictTagNames(void);
+   std::map<std::string, std::list<std::string> >*
+       GetPubDictTagNamesByCategory(void);
+
+	void LoadDictFromFile(std::string FileName, DictKey Name);
+
+   gdcmDict* GetDict(DictKey DictName);
 	gdcmDict* GetDefaultPubDict(void);
+
+   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;
 };
 
+//-----------------------------------------------------------------------------
 #endif