X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictSet.h;h=86abe1cdf1946ba9e7a6ff0e05dca4bc67fedc8f;hb=74917aa3a592bde592130de5ece8d9315015b373;hp=4256ad8e3fc29defb1f33f0b6338ef1c05a3a42e;hpb=29bdd1e88a28b6267618f633f304e1154537ce7b;p=gdcm.git

diff --git a/src/gdcmDictSet.h b/src/gdcmDictSet.h
index 4256ad8e..86abe1cd 100644
--- a/src/gdcmDictSet.h
+++ b/src/gdcmDictSet.h
@@ -1,5 +1,5 @@
 // gdcmDictSet.h
-
+//-----------------------------------------------------------------------------
 #ifndef GDCMDICTSET_H
 #define GDCMDICTSET_H
 
@@ -10,6 +10,7 @@
 typedef std::string DictKey;
 typedef std::map<DictKey, gdcmDict*> DictSetHT;
 
+//-----------------------------------------------------------------------------
 /*
  * \defgroup gdcmDictSet
  * \brief  Container for managing a set of loaded dictionaries.
@@ -19,19 +20,7 @@ typedef std::map<DictKey, gdcmDict*> DictSetHT;
  *        (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 Name);
-   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
@@ -39,11 +28,38 @@ public:
 	// 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);
-	gdcmDict* GetDict(DictKey DictName);
-	gdcmDict* GetDefaultPubDict(void);
+   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);
+
+   gdcmDictEntry *NewVirtualDictEntry(guint16 group, guint16 element,
+                                      std::string vr = "Unknown",
+                                      std::string fourth = "Unknown",
+                                      std::string name   = "Unknown");
+
+   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;
+
+   std::map<std::string,gdcmDictEntry *> virtualEntry;
 };
 
+//-----------------------------------------------------------------------------
 #endif