X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDict.h;h=7c01895f29f90181dcedc5832c20d6440362f831;hb=b868cc4addde15e2f692a7b1fe9451c1335258f4;hp=dd4910dc3451a8ea33fb6a52913d26c50e12717b;hpb=a0091d68a2eaa1a0c128f962030bb6c45cc0c366;p=gdcm.git

diff --git a/src/gdcmDict.h b/src/gdcmDict.h
index dd4910dc..7c01895f 100644
--- a/src/gdcmDict.h
+++ b/src/gdcmDict.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDict.h,v $
   Language:  C++
-  Date:      $Date: 2004/11/16 02:54:35 $
-  Version:   $Revision: 1.23 $
+  Date:      $Date: 2005/01/07 09:03:52 $
+  Version:   $Revision: 1.28 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -19,7 +19,7 @@
 #ifndef GDCMDICT_H
 #define GDCMDICT_H
 
-#include "gdcmCommon.h"
+#include "gdcmBase.h"
 #include "gdcmDictEntry.h"
 
 #include <iostream>
@@ -30,8 +30,8 @@ namespace gdcm
 {
 
 //-----------------------------------------------------------------------------
+typedef std::string DictKey;
 typedef std::map<TagKey, DictEntry>  TagKeyHT;
-typedef std::map<TagName, DictEntry> TagNameHT;
 typedef std::list<std::string>       EntryNamesList;
 typedef std::map<std::string, 
             std::list<std::string> > EntryNamesByCatMap;
@@ -39,14 +39,14 @@ typedef std::map<std::string,
 /*
  * \defgroup Dict
  * \brief    Dict acts a memory representation of a dicom dictionary i.e.
- *           it is a container for a collection of dictionary entries. The
- *           dictionary is loaded from in an ascii file.
+ *           it is a container for a collection of dictionary entries.
+ *           The dictionary is loaded from in an ascii file.
  *           There should be a single public dictionary (THE dictionary of
  *           the actual DICOM v3) but as many shadow dictionaries as imagers 
  *           combined with all software versions...
  * \see DictSet
  */
-class GDCM_EXPORT Dict
+class GDCM_EXPORT Dict : public Base
 {
 public:
    Dict(std::string const & filename);
@@ -55,16 +55,14 @@ public:
 // 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 (DictEntry const & newEntry);
-   bool ReplaceEntry(DictEntry const & newEntry);
-   bool RemoveEntry (TagKey const & key);
+   bool AddNewEntry (DictEntry const &newEntry);
+   bool ReplaceEntry(DictEntry const &newEntry);
+   bool RemoveEntry (TagKey const &key);
    bool RemoveEntry (uint16_t group, uint16_t element);
    
 // Tag
-   DictEntry *GetDictEntryByName(TagName const & name);
    DictEntry *GetDictEntryByNumber(uint16_t group, uint16_t element);
 
    EntryNamesList *GetDictEntryNames();
@@ -76,17 +74,14 @@ public:
 
    /// \brief  Returns a ref to the Dicom Dictionary H table (map)
    /// @return the Dicom Dictionary H table
-   const TagNameHT & GetEntriesByName() const { return NameHt; }
  
 private:
    /// ASCII file holding the Dictionnary
    std::string Filename;
 
-   /// Access through TagKey (see alternate access with NameHt)
+   /// Access through TagKey
    TagKeyHT  KeyHt;
 
-   /// Access through TagName (see alternate access with KeyHt)
-   TagNameHT NameHt;
 };
 } // end namespace gdcm