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

diff --git a/src/gdcmDictSet.h b/src/gdcmDictSet.h
index 21900ae2..e9d3bcbc 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/07/11 20:44:52 $
-  Version:   $Revision: 1.44 $
+  Date:      $Date: 2005/11/28 15:20:33 $
+  Version:   $Revision: 1.51 $
                                                                                 
   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 GDCMDICTSET_H
 #define GDCMDICTSET_H
 
-#include "gdcmBase.h"
+#include "gdcmCommandManager.h"
 #include "gdcmDict.h"
 
 #include <map>
@@ -27,23 +27,24 @@
 
 namespace gdcm 
 {
+//-----------------------------------------------------------------------------
 typedef std::map<DictKey, Dict*> DictSetHT;
-typedef std::string ExtendedTagKey;
-typedef std::map<ExtendedTagKey, DictEntry>  ExtendedTagKeyHT;
 
 //-----------------------------------------------------------------------------
 /**
  * \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
+ *         - reloading an already loaded dictionary (saving time)
+ *         - having many in memory representations of the same dictionary
  *        (saving memory).
  */
-class GDCM_EXPORT DictSet : public Base
+class GDCM_EXPORT DictSet : public CommandManager
 {
+   gdcmTypeMacro(DictSet);
+
 public:
-   DictSet();
-   ~DictSet();
+/// \brief Contructs a DictSet with a RefCounter
+   static DictSet *New() {return new DictSet();}
 
    void Print(std::ostream &os = std::cout, std::string const &indent = "" );
 
@@ -57,35 +58,29 @@ public:
    Dict *GetDict( DictKey const &DictName );
 
    /// \brief   Returns the default reference DICOM V3 public dictionary.
-   Dict* GetDefaultPubDict() { return GetDict(PUB_DICT_NAME); };
+   Dict* GetDefaultPubDict() { return GetDict(PUB_DICT_NAME); }
 
    // \ brief   Returns the virtual references DICOM dictionary.
    // \ warning : not end user intended
-   // Dict *GetVirtualDict() { return &VirtualEntries; };
+   // Dict *GetVirtualDict() { return &VirtualEntries; }
 
-   DictEntry *NewVirtualDictEntry(uint16_t group, uint16_t elem,
-                                  TagName vr     = GDCM_UNKNOWN,
-                                  TagName vm     = GDCM_UNKNOWN,
-                                  TagName name   = GDCM_UNKNOWN);
-
-   Dict *GetFirstEntry();
-   Dict *GetNextEntry();
+   Dict *GetFirstDict();
+   Dict *GetNextDict();
 
    static std::string BuildDictPath();
 
 protected:
-   bool AppendDict(Dict *NewDict, DictKey const &name);
+   DictSet();
+   ~DictSet();
 
 private:
    /// Hash table of all dictionaries contained in this DictSet
    DictSetHT Dicts;
+   /// Iterator to visit the Dictionaries of a given DictSet
    DictSetHT::iterator ItDictHt;
 
    /// Directory path to dictionaries
    std::string DictPath;
-
-   /// H table for the on the fly created DictEntries  
-   ExtendedTagKeyHT VirtualEntries; 
 };
 } // end namespace gdcm