X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictSet.h;h=21900ae292ac7f1f3f3cb7079226427716d325dc;hb=eeb624df6a1661e969566c200505f3dac84f4cd6;hp=cf1fc0b5c2e20f58bcf41e845e4f46ffcdea5e6e;hpb=a7fd99a84f77ff929d8335e3a03c9945276e905f;p=gdcm.git

diff --git a/src/gdcmDictSet.h b/src/gdcmDictSet.h
index cf1fc0b5..21900ae2 100644
--- a/src/gdcmDictSet.h
+++ b/src/gdcmDictSet.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDictSet.h,v $
   Language:  C++
-  Date:      $Date: 2005/01/17 10:56:50 $
-  Version:   $Revision: 1.37 $
+  Date:      $Date: 2005/07/11 20:44:52 $
+  Version:   $Revision: 1.44 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -28,10 +28,11 @@
 namespace gdcm 
 {
 typedef std::map<DictKey, Dict*> DictSetHT;
+typedef std::string ExtendedTagKey;
+typedef std::map<ExtendedTagKey, DictEntry>  ExtendedTagKeyHT;
 
 //-----------------------------------------------------------------------------
 /**
- * \ingroup DictSet
  * \brief  Container for managing a set of loaded dictionaries (Dict).
  * \note   Hopefully, sharing dictionaries should avoid
  * \par    reloading an already loaded dictionary (saving time)
@@ -44,34 +45,34 @@ public:
    DictSet();
    ~DictSet();
 
-   void Print(std::ostream &os = std::cout, std::string const & indent = "" );
+   void Print(std::ostream &os = std::cout, std::string const &indent = "" );
 
    // Probabely useless !
    //EntryNamesList *GetPubDictEntryNames();
-   //EntryNamesByCatMap* GetPubDictEntryNamesByCategory();
+   //EntryNamesByCatMap *GetPubDictEntryNamesByCategory();
 
    Dict *LoadDictFromFile( std::string const &fileName,
                            DictKey const &name );
 
    Dict *GetDict( DictKey const &DictName );
 
-   /// \brief   Retrieve the default reference DICOM V3 public dictionary.
+   /// \brief   Returns 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; };
+   // \ brief   Returns the virtual references DICOM dictionary.
+   // \ warning : not end user intended
+   // Dict *GetVirtualDict() { return &VirtualEntries; };
 
-   DictEntry *NewVirtualDictEntry(uint16_t group, uint16_t element,
+   DictEntry *NewVirtualDictEntry(uint16_t group, uint16_t elem,
                                   TagName vr     = GDCM_UNKNOWN,
                                   TagName vm     = GDCM_UNKNOWN,
                                   TagName name   = GDCM_UNKNOWN);
 
-   static std::string BuildDictPath();
-
-   void InitTraversal();
+   Dict *GetFirstEntry();
    Dict *GetNextEntry();
 
+   static std::string BuildDictPath();
+
 protected:
    bool AppendDict(Dict *NewDict, DictKey const &name);
 
@@ -84,7 +85,7 @@ private:
    std::string DictPath;
 
    /// H table for the on the fly created DictEntries  
-   TagKeyHT VirtualEntry; 
+   ExtendedTagKeyHT VirtualEntries; 
 };
 } // end namespace gdcm