X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDict.h;h=d5f9aea1493ff1c8283d0d1136be01cb1f95cb13;hb=7a06c1759c4f03b6c8dc7780bfda9b508a2250c5;hp=10a585693b1a93de7b15dd2a687219730c313f42;hpb=55d77e0913ff360d639af1841c70d14dc8687584;p=gdcm.git

diff --git a/src/gdcmDict.h b/src/gdcmDict.h
index 10a58569..d5f9aea1 100644
--- a/src/gdcmDict.h
+++ b/src/gdcmDict.h
@@ -1,5 +1,21 @@
-// gdcmDict.h
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmDict.h,v $
+  Language:  C++
+  Date:      $Date: 2004/07/28 21:23:20 $
+  Version:   $Revision: 1.17 $
+                                                                                
+  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.htm 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
 
@@ -11,7 +27,7 @@
 #include <map>
 
 //-----------------------------------------------------------------------------
-typedef std::map<TagKey,  gdcmDictEntry*> TagKeyHT;
+typedef std::map<gdcmTagKey, gdcmDictEntry*> TagKeyHT;
 typedef std::map<TagName, gdcmDictEntry*> TagNameHT;
 
 //-----------------------------------------------------------------------------
@@ -25,44 +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();
+   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);	
+   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);
-
+   bool ReplaceEntry(gdcmDictEntry *NewEntry);
+   bool RemoveEntry (gdcmTagKey key);
+   bool RemoveEntry (uint16_t group, uint16_t element);
+   
 // Tag
-	gdcmDictEntry *GetDictEntryByName(TagName name);
-	gdcmDictEntry *GetDictEntryByNumber(guint16 group, guint16 element);
+   gdcmDictEntry *GetDictEntryByName(TagName name);
+   gdcmDictEntry *GetDictEntryByNumber(uint16_t group, uint16_t element);
 
-   std::list<std::string> *GetDictEntryNames(void);
+   std::list<std::string> *GetDictEntryNames();
    std::map<std::string, std::list<std::string> > *
-        GetDictEntryNamesByCategory(void);
+        GetDictEntryNamesByCategory();
+
+   /// \brief  Returns a ref to the Dicom Dictionary H table (map)
+   /// @return the Dicom Dictionary H table
+   TagKeyHT & GetEntriesByKey()  { return KeyHt; }
 
-   /**
-    * \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; }
+   /// \brief  Returns a ref to the Dicom Dictionary H table (map)
+   /// @return the Dicom Dictionary H table
+   TagNameHT & GetEntriesByName()  { return NameHt; }
  
 private:
    /// ASCII file holding the Dictionnary
-   std::string filename;
-   /// Access through TagKey (see alternate access with NameHt)
-	TagKeyHT  KeyHt;
+   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;
 };
 
 //-----------------------------------------------------------------------------