* Improvement #2 : the CommandManager is now a static class so,

[gdcm.git] / src / gdcmDictSet.h

diff --git a/src/gdcmDictSet.h b/src/gdcmDictSet.h
index 414ef9900b374e8ac90e5de6d3a01937b1217882..f8f0c147fcc118b9bd2d02324b8d5529f1bea9ac 100644 (file)
--- 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/16 04:50:41 $
-  Version:   $Revision: 1.36 $
+  Date:      $Date: 2005/11/28 16:31:23 $
+  Version:   $Revision: 1.52 $
                                                                                 
   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 "gdcmRefCounter.h"
 #include "gdcmDict.h"
 
 #include <map>
@@ -27,60 +27,60 @@
 
 namespace gdcm 
 {
+//-----------------------------------------------------------------------------
 typedef std::map<DictKey, Dict*> DictSetHT;
 
 //-----------------------------------------------------------------------------
 /**
- * \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)
- * \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 RefCounter
 {
+   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 = "" );
+   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.
-   Dict* GetDefaultPubDict() { return GetDict(PUB_DICT_NAME); };
+   /// \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,
-                                  TagName vr     = GDCM_UNKNOWN,
-                                  TagName vm     = GDCM_UNKNOWN,
-                                  TagName name   = GDCM_UNKNOWN);
+   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  
-   TagKeyHT VirtualEntry; 
 };
 } // end namespace gdcm