X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictSet.h;h=9e2e2d777580a759e99c168c6a4d5d67d0e32a82;hb=224876ca6cbe71952f2a1d66d9853eca7745d3a0;hp=960296d6ac9ca0ee34ca8bb50cbef3e0149f1ff6;hpb=49c0af19f5bf0f2402d37d8abf7fb139e7453245;p=gdcm.git

diff --git a/src/gdcmDictSet.h b/src/gdcmDictSet.h
index 960296d6..9e2e2d77 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 00:59:21 $
-  Version:   $Revision: 1.22 $
+  Date:      $Date: 2007/08/22 16:14:04 $
+  Version:   $Revision: 1.55 $
                                                                                 
   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
@@ -16,67 +16,75 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMDICTSET_H
-#define GDCMDICTSET_H
+#ifndef _GDCMDICTSET_H
+#define _GDCMDICTSET_H
 
+#include "gdcmRefCounter.h"
 #include "gdcmDict.h"
+#include "gdcmGlobal.h"
+
 #include <map>
 #include <list>
 
-typedef std::string DictKey;
-typedef std::map<DictKey, gdcmDict*> DictSetHT;
+namespace GDCM_NAME_SPACE 
+{
+//-----------------------------------------------------------------------------
+typedef std::map<DictKey, Dict*> DictSetHT;
 
 //-----------------------------------------------------------------------------
-/*
- * \defgroup gdcmDictSet
- * \brief  Container for managing a set of loaded dictionaries.
+/**
+ * \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 gdcmDictSet
+class GDCM_EXPORT DictSet : public RefCounter
 {
+   gdcmTypeMacro(DictSet);
+
 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();
+/// \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);
+   // Probabely useless !
+   //EntryNamesList *GetPubDictEntryNames();
+   //EntryNamesByCatMap *GetPubDictEntryNamesByCategory();
 
-   std::list<std::string> *GetPubDictEntryNames();
-   std::map<std::string, std::list<std::string> > *
-       GetPubDictEntryNamesByCategory();
+   Dict *LoadDictFromFile( std::string const &fileName,
+                           DictKey const &name );
 
-   gdcmDict *LoadDictFromFile(std::string FileName, DictKey Name);
+   Dict *GetDict( DictKey const &DictName );
 
-   gdcmDict *GetDict(DictKey DictName);
-   gdcmDict *GetDefaultPubDict();
+   /// \brief   Returns the default reference DICOM V3 public dictionary.
+   //Dict* GetDefaultPubDict() { return GetDict(PUB_DICT_NAME); }
+   Dict* GetDefaultPubDict() { return Global::DefaultPubDict; } 
+   
+   // \ brief   Returns the virtual references DICOM dictionary.
+   // \ warning : not end user intended
+   // Dict *GetVirtualDict() { return &VirtualEntries; }
 
-   gdcmDictEntry *NewVirtualDictEntry(uint16_t group, uint16_t element,
-                                      std::string vr     = "Unknown",
-                                      std::string fourth = "Unknown",
-                                      std::string name   = "Unknown");
+   Dict *GetFirstDict();
+   Dict *GetNextDict();
 
    static std::string BuildDictPath();
 
 protected:
-   bool AppendDict(gdcmDict *NewDict,DictKey Name);
+   DictSet();
+   ~DictSet();
 
 private:
-   /// Hash table of all dictionaries contained in this gdcmDictSet
+   /// 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 gdcmDictEntries  
-   std::map<std::string,gdcmDictEntry *> virtualEntry;
 };
+} // end namespace gdcm
 
 //-----------------------------------------------------------------------------
 #endif