X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictSet.h;h=0d4388a14867f49fdb016acac3489c3e480b68f0;hb=7350639601914cd8ab02bfb0d6668c5bf56ce2f4;hp=895459d094903057916db82a368bb447deeaa0b3;hpb=867b8ef63054497249cc3a0138107383d60351dc;p=gdcm.git

diff --git a/src/gdcmDictSet.h b/src/gdcmDictSet.h
index 895459d0..0d4388a1 100644
--- a/src/gdcmDictSet.h
+++ b/src/gdcmDictSet.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDictSet.h,v $
   Language:  C++
-  Date:      $Date: 2004/10/18 02:17:07 $
-  Version:   $Revision: 1.28 $
+  Date:      $Date: 2005/02/01 13:11:49 $
+  Version:   $Revision: 1.40 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -19,60 +19,65 @@
 #ifndef GDCMDICTSET_H
 #define GDCMDICTSET_H
 
+#include "gdcmBase.h"
 #include "gdcmDict.h"
+
 #include <map>
 #include <list>
 
 namespace gdcm 
 {
-typedef std::string DictKey;
 typedef std::map<DictKey, Dict*> DictSetHT;
 
 //-----------------------------------------------------------------------------
-/*
- * \defgroup DictSet
- * \brief  Container for managing a set of loaded dictionaries.
+/**
+ * \brief  Container for managing a set of loaded dictionaries (Dict).
  * \note   Hopefully, sharing dictionaries should avoid
  * \par    reloading an already loaded dictionary (saving time)
  * \par    having many in memory representations of the same dictionary
  *        (saving memory).
  */
-class GDCM_EXPORT DictSet
+class GDCM_EXPORT DictSet : public Base
 {
 public:
    DictSet();
    ~DictSet();
 
-   void Print(std::ostream& os);
+   void Print(std::ostream &os = std::cout, std::string const &indent = "" );
 
-   EntryNamesList * GetPubDictEntryNames();
-   EntryNamesByCatMap * GetPubDictEntryNamesByCategory();
+   // Probabely useless !
+   //EntryNamesList *GetPubDictEntryNames();
+   //EntryNamesByCatMap* GetPubDictEntryNamesByCategory();
 
-   Dict* LoadDictFromFile( std::string const & fileName,
-                           DictKey const & name );
+   Dict *LoadDictFromFile( std::string const &fileName,
+                           DictKey const &name );
 
-   Dict* GetDict( DictKey const & DictName );
+   Dict *GetDict( DictKey const &DictName );
 
    /// \brief   Retrieve the default reference DICOM V3 public dictionary.
    Dict* GetDefaultPubDict() { return GetDict(PUB_DICT_NAME); };
 
    // \brief   Retrieve the virtual reference DICOM dictionary.
    // \warning : not end user intended
-   // Dict* GetVirtualDict() { return &VirtualEntry; };
+   // Dict *GetVirtualDict() { return &VirtualEntry; };
 
-   DictEntry* NewVirtualDictEntry(uint16_t group, uint16_t element,
-                                  TagName vr     = "Unknown",
-                                  TagName fourth = "Unknown",
-                                  TagName name   = "Unknown");
+   DictEntry *NewVirtualDictEntry(uint16_t group, uint16_t elem,
+                                  TagName vr     = GDCM_UNKNOWN,
+                                  TagName vm     = GDCM_UNKNOWN,
+                                  TagName name   = GDCM_UNKNOWN);
 
    static std::string BuildDictPath();
 
+   Dict *GetFirstEntry();
+   Dict *GetNextEntry();
+
 protected:
-   bool AppendDict(Dict *NewDict, DictKey const & name);
+   bool AppendDict(Dict *NewDict, DictKey const &name);
 
 private:
    /// Hash table of all dictionaries contained in this DictSet
    DictSetHT Dicts;
+   DictSetHT::iterator ItDictHt;
 
    /// Directory path to dictionaries
    std::string DictPath;