X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictSet.h;h=667a04344238d399cf88d6a1891aa0a83f6f4579;hb=93748f382dadb5c9240c4156ce7bbe9dcc8da44f;hp=8ef38e959f3b52ed3733dc8e161707fefc7a6d47;hpb=1e74cf45bc96f14c342cc404f0f91dfffe0810b9;p=gdcm.git

diff --git a/src/gdcmDictSet.h b/src/gdcmDictSet.h
index 8ef38e95..667a0434 100644
--- a/src/gdcmDictSet.h
+++ b/src/gdcmDictSet.h
@@ -1,65 +1,92 @@
-// gdcmDictSet.h
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmDictSet.h,v $
+  Language:  C++
+  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.html for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
+
 #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:
-	// 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(void);
-   ~gdcmDictSet(void);
+   DictSet();
+   ~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> *GetPubDictTagNames(void);
-   std::map<std::string, std::list<std::string> > *
-       GetPubDictTagNamesByCategory(void);
+   Dict *LoadDictFromFile( std::string const &fileName,
+                           DictKey const &name );
 
-   void LoadDictFromFile(std::string FileName, DictKey Name);
+   Dict *GetDict( DictKey const &DictName );
 
-   gdcmDict *GetDict(DictKey DictName);
-   gdcmDict *GetDefaultPubDict(void);
+   /// \brief   Retrieve the default reference DICOM V3 public dictionary.
+   Dict* GetDefaultPubDict() { return GetDict(PUB_DICT_NAME); };
 
-   gdcmDictEntry *NewVirtualDictEntry(guint16 group, guint16 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; };
 
-   static std::string BuildDictPath(void);
+   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 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;
 
-   std::map<std::string,gdcmDictEntry *> virtualEntry;
+   /// H table for the on the fly created DictEntries  
+   TagKeyHT VirtualEntry; 
 };
+} // end namespace gdcm
 
 //-----------------------------------------------------------------------------
 #endif