X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDict.h;h=b901f57a9b78daef8f7e495fab0055c05570a3c2;hb=9232388f3d3f9defdc6a8ac291a79b9a97b79dcf;hp=77d837c9f0a3aa1cceb038b36f0fef1f8a251554;hpb=90a2b8eeadb9d5afb2bc165b080f8a4622f5deb4;p=gdcm.git

diff --git a/src/gdcmDict.h b/src/gdcmDict.h
index 77d837c9..b901f57a 100644
--- a/src/gdcmDict.h
+++ b/src/gdcmDict.h
@@ -1,15 +1,20 @@
 // gdcmDict.h
-
+//-----------------------------------------------------------------------------
 #ifndef GDCMDICT_H
 #define GDCMDICT_H
 
-#include <map>
 #include "gdcmCommon.h"
 #include "gdcmDictEntry.h"
 
-typedef map<TagKey,  gdcmDictEntry*> TagKeyHT;
-typedef map<TagName, gdcmDictEntry*> TagNameHT;
+#include <iostream>
+#include <list>
+#include <map>
+
+//-----------------------------------------------------------------------------
+typedef std::map<TagKey,  gdcmDictEntry*> TagKeyHT;
+typedef std::map<TagName, gdcmDictEntry*> TagNameHT;
 
+//-----------------------------------------------------------------------------
 /*
  * \defgroup gdcmDict
  * \brief    gdcmDict acts a memory representation of a dicom dictionary i.e.
@@ -21,25 +26,44 @@ typedef map<TagName, gdcmDictEntry*> TagNameHT;
  * \see gdcmDictSet
  */
 class GDCM_EXPORT gdcmDict {
-	string name;
-	string filename;
+public:
+   gdcmDict(std::string & FileName);
+	~gdcmDict();
+
+// Print
+	void Print(std::ostream &os = std::cout);
+	void PrintByKey(std::ostream &os = std::cout);
+	void PrintByName(std::ostream &os = std::cout);	
+
+// Entries
+   bool AddNewEntry (gdcmDictEntry *NewEntry);
+	bool ReplaceEntry(gdcmDictEntry *NewEntry);
+	bool RemoveEntry (TagKey key);
+	bool RemoveEntry (guint16 group, guint16 element);
+
+// Tag
+	gdcmDictEntry *GetDictEntryByName(TagName name);
+	gdcmDictEntry *GetDictEntryByNumber(guint16 group, guint16 element);
+
+   std::list<std::string> *GetDictEntryNames(void);
+   std::map<std::string, std::list<std::string> > *
+        GetDictEntryNamesByCategory(void);
+
+   /**
+    * \ingroup gdcmDict
+    * \brief   returns a ref to the Dicom Dictionary H table (map)
+    * return the Dicom Dictionary H table
+    */
+   inline TagKeyHT & gdcmDict::GetEntries(void)  { return KeyHt; }
+ 
+private:
+   std::string filename;
+
    /// Access through TagKey (see alternate access with NameHt)
 	TagKeyHT  KeyHt;
    /// Access through TagName (see alternate access with KeyHt)
 	TagNameHT NameHt;
-public:
-	gdcmDict(string & FileName);
-	~gdcmDict();
-	int AddNewEntry (gdcmDictEntry* NewEntry);
-	int ReplaceEntry(gdcmDictEntry* NewEntry);
-	int RemoveEntry (TagKey key);
-	int RemoveEntry (guint16 group, guint16 element);
-	gdcmDictEntry * GetTagByNumber(guint16 group, guint16 element);
-	gdcmDictEntry * GetTagByName(TagName name);
-	void Print(ostream&);
-	void PrintByKey(ostream&);
-	void PrintByName(ostream&);
-	TagKeyHT & GetEntries(void) { return KeyHt; }
 };
 
+//-----------------------------------------------------------------------------
 #endif