Reverse order sorting now works, even with user supplied function.

[gdcm.git] / src / gdcmDictSet.h

diff --git a/src/gdcmDictSet.h b/src/gdcmDictSet.h
index 3ccc09d97f26fbcc36953643644b4d9f0e428100..21900ae292ac7f1f3f3cb7079226427716d325dc 100644 (file)
--- a/src/gdcmDictSet.h
+++ b/src/gdcmDictSet.h
@@ -1,49 +1,93 @@
-// gdcmDictSet.h
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmDictSet.h,v $
+  Language:  C++
+  Date:      $Date: 2005/07/11 20:44:52 $
+  Version:   $Revision: 1.44 $
+                                                                                
+  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>
-#include "gdcmDict.h"
 
-typedef string DictKey;
-typedef map<DictKey, gdcmDict*> DictSetHT;
+namespace gdcm 
+{
+typedef std::map<DictKey, Dict*> DictSetHT;
+typedef std::string ExtendedTagKey;
+typedef std::map<ExtendedTagKey, DictEntry>  ExtendedTagKeyHT;
 
-/*
- * \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 allready loaded dictionary (saving time)
+ * \par    reloading an already loaded dictionary (saving time)
  * \par    having many in memory representations of the same dictionary
  *        (saving memory).
  */
-class GDCM_EXPORT gdcmDictSet {
-private:
-       DictSetHT dicts;
-       int AppendDict(gdcmDict* NewDict);
-       void LoadDictFromFile(string filename, DictKey);
+class GDCM_EXPORT DictSet : public Base
+{
+public:
+   DictSet();
+   ~DictSet();
+
+   void Print(std::ostream &os = std::cout, std::string const &indent = "" );
+
+   // Probabely useless !
+   //EntryNamesList *GetPubDictEntryNames();
+   //EntryNamesByCatMap *GetPubDictEntryNamesByCategory();
+
+   Dict *LoadDictFromFile( std::string const &fileName,
+                           DictKey const &name );
+
+   Dict *GetDict( DictKey const &DictName );
+
+   /// \brief   Returns the default reference DICOM V3 public dictionary.
+   Dict* GetDefaultPubDict() { return GetDict(PUB_DICT_NAME); };
+
+   // \ brief   Returns the virtual references DICOM dictionary.
+   // \ warning : not end user intended
+   // Dict *GetVirtualDict() { return &VirtualEntries; };
+
+   DictEntry *NewVirtualDictEntry(uint16_t group, uint16_t elem,
+                                  TagName vr     = GDCM_UNKNOWN,
+                                  TagName vm     = GDCM_UNKNOWN,
+                                  TagName name   = GDCM_UNKNOWN);
+
+   Dict *GetFirstEntry();
+   Dict *GetNextEntry();
+
+   static std::string BuildDictPath();
+
+protected:
+   bool AppendDict(Dict *NewDict, DictKey const &name);
+
 private:
+   /// Hash table of all dictionaries contained in this DictSet
+   DictSetHT Dicts;
+   DictSetHT::iterator ItDictHt;
+
    /// Directory path to dictionaries
-       static string DictPath;
-       static string BuildDictPath(void);
-       static gdcmDict* DefaultPubDict;
-public:
-       static list<string> * GetPubDictTagNames(void);
-       static map<string, list<string> >* GetPubDictTagNamesByCategory(void);
-       static gdcmDict* LoadDefaultPubDict(void);
-
-       // TODO Swig int LoadDictFromFile(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(string filename);
-       // TODO Swig int LoadAllDictFromDirectory(string DirectoryName);
-       // TODO Swig string* GetAllDictNames();
-       gdcmDictSet(void);
-       void Print(ostream&);
-       gdcmDict* GetDict(DictKey DictName);
-       gdcmDict* GetDefaultPubDict(void);
+   std::string DictPath;
+
+   /// H table for the on the fly created DictEntries  
+   ExtendedTagKeyHT VirtualEntries; 
 };
+} // end namespace gdcm
 
+//-----------------------------------------------------------------------------
 #endif