X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDict.h;h=ab03c709ebee821d3c23b1dd8d327aa829cc6a6b;hb=963480c814326423065a4a02fa1bf8bc1243ae4f;hp=2b90d10b3e737a5a9e2a33d7aa969dfc966c54d2;hpb=c42a0d560374ca98eb7f1531de835fd4cd1c59b0;p=gdcm.git

diff --git a/src/gdcmDict.h b/src/gdcmDict.h
index 2b90d10b..ab03c709 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/10/27 22:31:12 $
-  Version:   $Revision: 1.22 $
+  Date:      $Date: 2005/01/18 07:49:41 $
+  Version:   $Revision: 1.33 $
                                                                                 
   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,62 +30,55 @@ namespace gdcm
 {
 
 //-----------------------------------------------------------------------------
-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;
+typedef std::string DictKey;
+typedef std::map<TagKey, DictEntry>  TagKeyHT;
+typedef std::list<std::string>       EntryNamesList;
+typedef std::map<std::string, 
+            std::list<std::string> > EntryNamesByCatMap;
 //-----------------------------------------------------------------------------
-/*
- * \defgroup Dict
+/**
+ * \ingroup 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(void);
    Dict(std::string const & filename);
    ~Dict();
 
 // 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, std::string const & indent = "");
 
 // Entries
-   bool AddNewEntry (DictEntry const & newEntry);
-   bool ReplaceEntry(DictEntry const & newEntry);
-   bool RemoveEntry (TagKey const & key);
+   void ClearEntry  ();
+   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);
+   DictEntry *GetDictEntry(uint16_t group, uint16_t element);
 
-   EntryNamesList *GetDictEntryNames();
-   EntryNamesByCatMap *GetDictEntryNamesByCategory();
+  // EntryNamesList *GetDictEntryNames();
+  // EntryNamesByCatMap *GetDictEntryNamesByCategory();
 
-   /// \brief  Returns a ref to the Dicom Dictionary H table (map)
-   /// @return the Dicom Dictionary H table
-   const TagKeyHT & GetEntriesByKey() const { return KeyHt; }
+   DictEntry *GetFirstEntry();
+   DictEntry *GetNextEntry();
 
-   /// \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)
-   TagKeyHT  KeyHt;
-
-   /// Access through TagName (see alternate access with KeyHt)
-   TagNameHT NameHt;
+   /// Access through TagKey
+   TagKeyHT KeyHt;
+   TagKeyHT::iterator ItKeyHt;
 };
 } // end namespace gdcm