BUG: Remove tons of mem leaks. There are still plenty that explains why gdcm is dog...

[gdcm.git] / src / gdcmDictSet.h

diff --git a/src/gdcmDictSet.h b/src/gdcmDictSet.h
index 6588e53bf19a594a9228735fce6d9030c45cdfca..895459d094903057916db82a368bb447deeaa0b3 100644 (file)
--- a/src/gdcmDictSet.h
+++ b/src/gdcmDictSet.h
@@ -1,5 +1,21 @@
-// gdcmDictSet.h
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmDictSet.h,v $
+  Language:  C++
+  Date:      $Date: 2004/10/18 02:17:07 $
+  Version:   $Revision: 1.28 $
+                                                                                
+  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
 
@@ -7,52 +23,64 @@
 #include <map>
 #include <list>
 
+namespace gdcm 
+{
 typedef std::string DictKey;
-typedef std::map<DictKey, gdcmDict*> DictSetHT;
+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:
-       // 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);
+
+   EntryNamesList * GetPubDictEntryNames();
+   EntryNamesByCatMap * GetPubDictEntryNamesByCategory();
 
-       void Print(std::ostream& os);
+   Dict* LoadDictFromFile( std::string const & fileName,
+                           DictKey const & name );
 
-   std::list<std::string> * GetPubDictTagNames(void);
-   std::map<std::string, std::list<std::string> >*
-       GetPubDictTagNamesByCategory(void);
+   Dict* GetDict( DictKey const & DictName );
 
-       void LoadDictFromFile(std::string FileName, DictKey Name);
+   /// \brief   Retrieve the default reference DICOM V3 public dictionary.
+   Dict* GetDefaultPubDict() { return GetDict(PUB_DICT_NAME); };
 
-   gdcmDict* GetDict(DictKey DictName);
-       gdcmDict* GetDefaultPubDict(void);
+   // \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 element,
+                                  TagName vr     = "Unknown",
+                                  TagName fourth = "Unknown",
+                                  TagName name   = "Unknown");
+
+   static std::string BuildDictPath();
 
 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;
+
    /// Directory path to dictionaries
    std::string DictPath;
+
+   /// H table for the on the fly created DictEntries  
+   TagKeyHT VirtualEntry; 
 };
+} // end namespace gdcm
 
 //-----------------------------------------------------------------------------
 #endif