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

diff --git a/src/gdcmDictSet.h b/src/gdcmDictSet.h
index f2f50634..1fee82f9 100644
--- a/src/gdcmDictSet.h
+++ b/src/gdcmDictSet.h
@@ -1,37 +1,26 @@
 // gdcmDictSet.h
-
+//-----------------------------------------------------------------------------
 #ifndef GDCMDICTSET_H
 #define GDCMDICTSET_H
 
+#include "gdcmDict.h"
 #include <map>
 #include <list>
-#include "gdcmDict.h"
 
 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 allready loaded dictionary (saving time)
+ * \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:
-   /// Hash table of all dictionaries contained in this gdcmDictSet
-	DictSetHT Dicts;
-   /// Directory path to dictionaries
-   std::string DictPath;
-	int AppendDict(gdcmDict* NewDict);
-	void LoadDictFromFile(std::string filename, DictKey);
-   std::string BuildDictPath(void);
 public:
-   std::list<std::string> * GetPubDictTagNames(void);
-   std::map<std::string, std::list<std::string> >*
-       GetPubDictTagNamesByCategory(void);
-
 	// 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
@@ -41,9 +30,29 @@ public:
 	// TODO Swig std::string* GetAllDictNames();
 	gdcmDictSet(void);
 	~gdcmDictSet(void);
-	void Print(ostream&);
-	gdcmDict* GetDict(DictKey DictName);
+
+	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