X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictSet.h;h=b2be826a7490b2410b9fc0e2eefdc4f612eb2ff3;hb=786ec05267c2b2892666e1a2ee3ca8a5d2c877a1;hp=d6f5b4c9d06a5ad74b5a1987004c61853a2a9b54;hpb=4b4569ba7d0829cf3782ff6b5bbe5ae1009466e6;p=gdcm.git

diff --git a/src/gdcmDictSet.h b/src/gdcmDictSet.h
index d6f5b4c9..b2be826a 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/08/01 02:39:09 $
-  Version:   $Revision: 1.23 $
+  Date:      $Date: 2004/12/16 13:46:37 $
+  Version:   $Revision: 1.30 $
                                                                                 
   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,69 @@
 #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
+ * \defgroup DictSet
  * \brief  Container for managing a set of loaded dictionaries.
  * \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:
-   // TODO Swig int LoadDictFromFile(std::string filename);
-   // QUESTION: the following function might not be thread safe !? Maybe
-   //           we need some mutex here, to avoid concurent creation of
-   //           the same dictionary !?!?!
-   // TODO Swig int LoadDictFromName(std::string filename);
-   // TODO Swig int LoadAllDictFromDirectory(std::string DirectoryName);
-   // TODO Swig std::string* GetAllDictNames();
-   gdcmDictSet();
-   ~gdcmDictSet();
+   DictSet();
+   ~DictSet();
 
    void Print(std::ostream& os);
 
-   std::list<std::string> *GetPubDictEntryNames();
-   std::map<std::string, std::list<std::string> > *
-       GetPubDictEntryNamesByCategory();
+   EntryNamesList * GetPubDictEntryNames();
+   EntryNamesByCatMap * GetPubDictEntryNamesByCategory();
+
+   Dict* LoadDictFromFile( std::string const & fileName,
+                           DictKey const & name );
 
-   gdcmDict *LoadDictFromFile(std::string const & fileName, DictKey const & name);
+   Dict* GetDict( DictKey const & DictName );
 
-   gdcmDict *GetDict(DictKey const & DictName);
-   gdcmDict *GetDefaultPubDict();
+   /// \brief   Retrieve the default reference DICOM V3 public dictionary.
+   Dict* GetDefaultPubDict() { return GetDict(PUB_DICT_NAME); };
 
-   gdcmDictEntry *NewVirtualDictEntry(uint16_t group, uint16_t element,
-                                      std::string vr     = "Unknown",
-                                      std::string fourth = "Unknown",
-                                      std::string name   = "Unknown");
+   // \brief   Retrieve the virtual reference DICOM dictionary.
+   // \warning : not end user intended
+   // Dict* GetVirtualDict() { return &VirtualEntry; };
+
+   DictEntry* NewVirtualDictEntry(uint16_t group, uint16_t element,
+                                  TagName vr     = "Unknown",
+                                  TagName fourth = "Unknown",
+                                  TagName name   = "Unknown");
 
    static std::string BuildDictPath();
 
 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;
+
    /// Directory path to dictionaries
    std::string DictPath;
-   /// H table for the on the fly created gdcmDictEntries  
-   std::map<std::string,gdcmDictEntry *> VirtualEntry;
+
+   /// H table for the on the fly created DictEntries  
+   TagKeyHT VirtualEntry; 
 };
+} // end namespace gdcm
 
 //-----------------------------------------------------------------------------
 #endif