X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmDict.h;h=d42548c05a365fdaa04d50bb248efb97ea63303d;hb=ab3dc69a71af640fa49cbd917272d9ff7d1651b6;hp=7c01895f29f90181dcedc5832c20d6440362f831;hpb=43f675c5d192ff4b28c42397d36beee5988419de;p=gdcm.git

diff --git a/src/gdcmDict.h b/src/gdcmDict.h
index 7c01895f..d42548c0 100644
--- a/src/gdcmDict.h
+++ b/src/gdcmDict.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDict.h,v $
   Language:  C++
-  Date:      $Date: 2005/01/07 09:03:52 $
-  Version:   $Revision: 1.28 $
+  Date:      $Date: 2005/01/24 14:14:11 $
+  Version:   $Revision: 1.35 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -32,12 +32,12 @@ namespace gdcm
 //-----------------------------------------------------------------------------
 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;
+//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.
@@ -49,39 +49,33 @@ typedef std::map<std::string,
 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 Print(std::ostream &os = std::cout, std::string const & indent = "");
 
 // Entries
-   bool AddNewEntry (DictEntry const &newEntry);
+   void ClearEntry  ();
+   bool AddEntry (DictEntry const &newEntry);
    bool ReplaceEntry(DictEntry const &newEntry);
    bool RemoveEntry (TagKey const &key);
-   bool RemoveEntry (uint16_t group, uint16_t element);
+   bool RemoveEntry (uint16_t group, uint16_t elem);
    
 // Tag
-   DictEntry *GetDictEntryByNumber(uint16_t group, uint16_t element);
+   DictEntry *GetEntry(uint16_t group, uint16_t elem);
 
-   EntryNamesList *GetDictEntryNames();
-   EntryNamesByCatMap *GetDictEntryNamesByCategory();
+   DictEntry *GetFirstEntry();
+   DictEntry *GetNextEntry();
 
-   /// \brief  Returns a ref to the Dicom Dictionary H table (map)
-   /// @return the Dicom Dictionary H table
-   const TagKeyHT & GetEntriesByKey() const { return KeyHt; }
-
-   /// \brief  Returns a ref to the Dicom Dictionary H table (map)
-   /// @return the Dicom Dictionary H table
- 
 private:
    /// ASCII file holding the Dictionnary
    std::string Filename;
 
    /// Access through TagKey
-   TagKeyHT  KeyHt;
-
+   TagKeyHT KeyHt;
+   TagKeyHT::iterator ItKeyHt;
 };
 } // end namespace gdcm