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

diff --git a/src/gdcmDict.h b/src/gdcmDict.h
index cf340244..961d245f 100644
--- a/src/gdcmDict.h
+++ b/src/gdcmDict.h
@@ -1,14 +1,33 @@
-// gdcmDict.h
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmDict.h,v $
+  Language:  C++
+  Date:      $Date: 2004/09/27 08:39:06 $
+  Version:   $Revision: 1.18 $
+                                                                                
+  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
+  l'Image). All rights reserved. See Doc/License.txt or
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
+
 #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<gdcmTagKey, gdcmDictEntry*> TagKeyHT;
 typedef std::map<TagName, gdcmDictEntry*> TagNameHT;
 
 //-----------------------------------------------------------------------------
@@ -22,40 +41,46 @@ typedef std::map<TagName, gdcmDictEntry*> TagNameHT;
  *           combined with all software versions...
  * \see gdcmDictSet
  */
-class GDCM_EXPORT gdcmDict {
+class GDCM_EXPORT gdcmDict
+{
 public:
-   gdcmDict(std::string & FileName);
-	~gdcmDict();
-
-	void Print(std::ostream&);
-	void PrintByKey(std::ostream&);
-	void PrintByName(std::ostream&);	
-
-   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);
-
-   /**
-    * \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; 
-   }
+   gdcmDict(std::string const & 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 (gdcmTagKey key);
+   bool RemoveEntry (uint16_t group, uint16_t element);
+   
+// Tag
+   gdcmDictEntry *GetDictEntryByName(TagName name);
+   gdcmDictEntry *GetDictEntryByNumber(uint16_t group, uint16_t element);
+
+   std::list<std::string> *GetDictEntryNames();
+   std::map<std::string, std::list<std::string> > *
+        GetDictEntryNamesByCategory();
+
+   /// \brief  Returns a ref to the Dicom Dictionary H table (map)
+   /// @return the Dicom Dictionary H table
+   TagKeyHT & GetEntriesByKey()  { return KeyHt; }
+
+   /// \brief  Returns a ref to the Dicom Dictionary H table (map)
+   /// @return the Dicom Dictionary H table
+   TagNameHT & GetEntriesByName()  { return NameHt; }
  
 private:
-   std::string name;
-   std::string filename;
-   /// Access through TagKey (see alternate access with NameHt)
-	TagKeyHT  KeyHt;
+   /// ASCII file holding the Dictionnary
+   std::string Filename;
+   /// Access through gdcmTagKey (see alternate access with NameHt)
+   TagKeyHT  KeyHt;
    /// Access through TagName (see alternate access with KeyHt)
-	TagNameHT NameHt;
-
+   TagNameHT NameHt;
 };
 
 //-----------------------------------------------------------------------------