X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDict.h;h=10a585693b1a93de7b15dd2a687219730c313f42;hb=c8d390d6a732aa48eeb9d831ea83f4bebc8e19f8;hp=37d0076e3caf192b0b103df295dafc79f6f53c06;hpb=3e78befc911eac2ecc70747854911d1f803797b5;p=gdcm.git

diff --git a/src/gdcmDict.h b/src/gdcmDict.h
index 37d0076e..10a58569 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"
 
+#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 std::map<TagName, gdcmDictEntry*> TagNameHT;
  * \see gdcmDictSet
  */
 class GDCM_EXPORT gdcmDict {
-   std::string name;
+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:
+   /// ASCII file holding the Dictionnary
    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(std::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(std::ostream&);
-	void PrintByKey(std::ostream&);
-	void PrintByName(std::ostream&);
-	TagKeyHT & GetEntries(void) { return KeyHt; }
 };
 
+//-----------------------------------------------------------------------------
 #endif