X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictSet.h;h=667a04344238d399cf88d6a1891aa0a83f6f4579;hb=d00078b5e19310b379c8339fa8fe38362e8ca392;hp=4eb4189a5673ce6d696b6e2ee234b18e2f3850d1;hpb=020d769ac045f06318b7061bfdfa0e1adfd9edd5;p=gdcm.git

diff --git a/src/gdcmDictSet.h b/src/gdcmDictSet.h
index 4eb4189a..667a0434 100644
--- a/src/gdcmDictSet.h
+++ b/src/gdcmDictSet.h
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDictSet.h,v $
   Language:  C++
-  Date:      $Date: 2004/09/13 07:49:35 $
-  Version:   $Revision: 1.25 $
+  Date:      $Date: 2005/01/20 11:39:49 $
+  Version:   $Revision: 1.39 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
                                                                                 
      This software is distributed WITHOUT ANY WARRANTY; without even
      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
@@ -19,64 +19,74 @@
 #ifndef GDCMDICTSET_H
 #define GDCMDICTSET_H
 
+#include "gdcmBase.h"
 #include "gdcmDict.h"
+
 #include <map>
 #include <list>
 
-typedef std::string DictKey;
-typedef std::map<DictKey, gdcmDict*> DictSetHT;
+namespace gdcm 
+{
+typedef std::map<DictKey, Dict*> DictSetHT;
 
 //-----------------------------------------------------------------------------
-/*
- * \defgroup gdcmDictSet
- * \brief  Container for managing a set of loaded dictionaries.
+/**
+ * \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
  *        (saving memory).
  */
-class GDCM_EXPORT gdcmDictSet
+class GDCM_EXPORT DictSet : public Base
 {
 public:
-   gdcmDictSet();
-   ~gdcmDictSet();
+   DictSet();
+   ~DictSet();
 
-   void Print(std::ostream& os);
+   void Print(std::ostream &os = std::cout, std::string const & indent = "" );
 
-   std::list<std::string>* GetPubDictEntryNames();
-   std::map<std::string, std::list<std::string> > *
-       GetPubDictEntryNamesByCategory();
+   // Probabely useless !
+   //EntryNamesList *GetPubDictEntryNames();
+   //EntryNamesByCatMap* GetPubDictEntryNamesByCategory();
 
-   gdcmDict* LoadDictFromFile( std::string const & fileName,
-                               DictKey const & name );
+   Dict *LoadDictFromFile( std::string const &fileName,
+                           DictKey const &name );
 
-   gdcmDict* GetDict( DictKey const & DictName );
+   Dict *GetDict( DictKey const &DictName );
 
    /// \brief   Retrieve the default reference DICOM V3 public dictionary.
-   gdcmDict* GetDefaultPubDict() { return GetDict(PUB_DICT_NAME); };
+   Dict* GetDefaultPubDict() { return GetDict(PUB_DICT_NAME); };
 
    // \brief   Retrieve the virtual reference DICOM dictionary.
    // \warning : not end user intended
-   // gdcmDict* GetVirtualDict() { return &VirtualEntry; };
+   // Dict *GetVirtualDict() { return &VirtualEntry; };
 
-   gdcmDictEntry* NewVirtualDictEntry(uint16_t group, uint16_t element,
-                                      std::string vr     = "Unknown",
-                                      std::string fourth = "Unknown",
-                                      std::string 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(gdcmDict *NewDict, DictKey const & name);
+   bool AppendDict(Dict *NewDict, DictKey const &name);
 
 private:
-   /// Hash table of all dictionaries contained in this gdcmDictSet
+   /// Hash table of all dictionaries contained in this DictSet
    DictSetHT Dicts;
+   DictSetHT::iterator ItDictHt;
+
    /// Directory path to dictionaries
    std::string DictPath;
-   /// H table for the on the fly created gdcmDictEntries  
+
+   /// H table for the on the fly created DictEntries  
    TagKeyHT VirtualEntry; 
 };
+} // end namespace gdcm
 
 //-----------------------------------------------------------------------------
 #endif