X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDict.h;h=b901f57a9b78daef8f7e495fab0055c05570a3c2;hb=a23d3b0e36743664f22f42269224f305ccf50fdb;hp=cf34024488841ec8ff7bdbebd896281bc2a3bb37;hpb=06c1c583239fdf5196260e6ef83a78669c1bd17f;p=gdcm.git

diff --git a/src/gdcmDict.h b/src/gdcmDict.h
index cf340244..b901f57a 100644
--- a/src/gdcmDict.h
+++ b/src/gdcmDict.h
@@ -5,6 +5,9 @@
 
 #include "gdcmCommon.h"
 #include "gdcmDictEntry.h"
+
+#include <iostream>
+#include <list>
 #include <map>
 
 //-----------------------------------------------------------------------------
@@ -27,35 +30,39 @@ public:
    gdcmDict(std::string & FileName);
 	~gdcmDict();
 
-	void Print(std::ostream&);
-	void PrintByKey(std::ostream&);
-	void PrintByName(std::ostream&);	
+// Print
+	void Print(std::ostream &os = std::cout);
+	void PrintByKey(std::ostream &os = std::cout);
+	void PrintByName(std::ostream &os = std::cout);	
 
-   bool AddNewEntry (gdcmDictEntry* NewEntry);
-	bool ReplaceEntry(gdcmDictEntry* NewEntry);
+// Entries
+   bool AddNewEntry (gdcmDictEntry *NewEntry);
+	bool ReplaceEntry(gdcmDictEntry *NewEntry);
 	bool RemoveEntry (TagKey key);
 	bool RemoveEntry (guint16 group, guint16 element);
 
-	gdcmDictEntry * GetTagByNumber(guint16 group, guint16 element);
-	gdcmDictEntry * GetTagByName(TagName name);
+// 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; 
-   }
+   inline TagKeyHT & gdcmDict::GetEntries(void)  { return KeyHt; }
  
 private:
-   std::string name;
    std::string filename;
+
    /// Access through TagKey (see alternate access with NameHt)
 	TagKeyHT  KeyHt;
    /// Access through TagName (see alternate access with KeyHt)
 	TagNameHT NameHt;
-
 };
 
 //-----------------------------------------------------------------------------