X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDict.h;h=66f0df52ed2207d1a0cefe565150beb13e813353;hb=7d8572bf6b911f746d4dc5389bb3270868957373;hp=e91d68233c9d66f772fdc188a606763218da0b21;hpb=5a6910a313a526514242a21b868c7186fca14168;p=gdcm.git

diff --git a/src/gdcmDict.h b/src/gdcmDict.h
index e91d6823..66f0df52 100644
--- a/src/gdcmDict.h
+++ b/src/gdcmDict.h
@@ -1,15 +1,20 @@
 // gdcmDict.h
-
+//-----------------------------------------------------------------------------
 #ifndef GDCMDICT_H
 #define GDCMDICT_H
 
 #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,34 +26,51 @@ typedef std::map<TagName, gdcmDictEntry*> TagNameHT;
  * \see gdcmDictSet
  */
 class GDCM_EXPORT gdcmDict {
-   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;
 public:
-	gdcmDict(std::string & FileName);
+   gdcmDict(std::string & FileName);
 	~gdcmDict();
-	bool AddNewEntry (gdcmDictEntry* NewEntry);
-	bool ReplaceEntry(gdcmDictEntry* NewEntry);
+
+// 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);
-	gdcmDictEntry * GetTagByNumber(guint16 group, guint16 element);
-	gdcmDictEntry * GetTagByName(TagName name);
-	void Print(std::ostream&);
-	void PrintByKey(std::ostream&);
-	void PrintByName(std::ostream&);	
-
- /**
- * \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; 
- }
+
+// 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 & GetEntriesByKey(void)  { return KeyHt; }
+
+   /**
+    * \ingroup gdcmDict
+    * \brief   returns a ref to the Dicom Dictionary H table (map)
+    * return the Dicom Dictionary H table
+    */
+   inline TagNameHT & GetEntriesByName(void)  { return NameHt; }
  
+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;
 };
 
+//-----------------------------------------------------------------------------
 #endif