-#include "gdcm.h"
-#include "gdcmUtil.h"
-
-#define PUB_DICT_NAME "DicomV3Dict"
-#ifndef PUB_DICT_PATH
-# define PUB_DICT_PATH "../Dicts/"
-#endif
-#define PUB_DICT_FILENAME "dicomV3.dic"
-
-gdcmDictSet::gdcmDictSet(void) {
- SetDictPath();
- if (! LoadDicomV3Dict())
- return;
-}
-
-void gdcmDictSet::SetDictPath(void) {
- const char* EnvPath = (char*)0;
- EnvPath = getenv("GDCM_DICT_PATH");
- if (EnvPath && (strlen(EnvPath) != 0)) {
- DictPath = EnvPath;
- if (DictPath[DictPath.length() -1] != '/' )
- DictPath += '/';
- dbg.Verbose(1, "gdcmDictSet::SetDictPath:",
- "Dictionary path set from environnement");
- } else
- DictPath = PUB_DICT_PATH;
+namespace gdcm
+{
+
+//-----------------------------------------------------------------------------
+// Constructor / Destructor
+/**
+ * \ingroup DictSet
+ * \brief The Dictionnary Set obtained with this constructor simply
+ * contains the Default Public dictionnary.
+ */
+DictSet::DictSet()
+{
+ DictPath = BuildDictPath();
+ std::string pubDictFile(DictPath);
+ pubDictFile += PUB_DICT_FILENAME;
+ Dicts[PUB_DICT_NAME] = new Dict(pubDictFile);
+}
+
+/**
+ * \ingroup DictSet
+ * \brief Destructor
+ */
+DictSet::~DictSet()
+{
+ // Remove dictionnaries
+ for (DictSetHT::iterator tag = Dicts.begin(); tag != Dicts.end(); ++tag)
+ {
+ Dict *entryToDelete = tag->second;
+ if ( entryToDelete )
+ {
+ delete entryToDelete;
+ }
+ tag->second = NULL;
+ }
+ Dicts.clear();
+
+ // Remove virtual dictionnary entries
+ std::map<std::string,DictEntry *>::iterator it;
+ for(it = VirtualEntry.begin(); it != VirtualEntry.end(); ++it)
+ {
+ DictEntry *entry = it->second;
+ if ( entry )
+ {
+ delete entry;
+ }
+ it->second = NULL;
+ }
+}
+
+//-----------------------------------------------------------------------------
+// Print
+/**
+ * \ingroup DictSet
+ * \brief Print, in an informal fashion, the list of all the dictionaries
+ * contained is this DictSet, along with their respective content.
+ * @param os Output stream used for printing.
+ */
+void DictSet::Print(std::ostream& os)
+{
+ for (DictSetHT::iterator dict = Dicts.begin(); dict != Dicts.end(); ++dict)
+ {
+ os << "Printing dictionary " << dict->first << std::endl;
+ dict->second->Print(os);
+ }
+}
+
+//-----------------------------------------------------------------------------
+// Public
+/**
+ * \ingroup DictSet
+ * \brief Consider all the entries of the public dicom dictionnary.
+ * Build all list of all the tag names of all those entries.
+ * \sa DictSet::GetPubDictTagNamesByCategory
+ * @return A list of all entries of the public dicom dictionnary.
+ */
+std::list<std::string> *DictSet::GetPubDictEntryNames()
+{
+ return GetDefaultPubDict()->GetDictEntryNames();
+}
+
+/**
+ * \ingroup DictSet
+ * \brief
+ * - Consider all the entries of the public dicom dictionnary.
+ * - Build an hashtable whose keys are the names of the groups
+ * (fourth field in each line of dictionary) and whose corresponding
+ * values are lists of all the dictionnary entries among that
+ * group. Note that apparently the Dicom standard doesn't explicitely
+ * define a name (as a string) for each group.
+ * - A typical usage of this method would be to enable a dynamic
+ * configuration of a Dicom file browser: the admin/user can
+ * select in the interface which Dicom tags should be displayed.
+ * \warning
+ * - Dicom *doesn't* define any name for any 'categorie'
+ * (the dictionnary fourth field was formerly NIH defined
+ * -and no longer he is-
+ * and will be removed when Dicom provides us a text file
+ * with the 'official' Dictionnary, that would be more friendly
+ * than asking us to perform a line by line check of the dictionnary
+ * at the beginning of each year to -try to- guess the changes)
+ * - Therefore : please NEVER use that fourth field :-(
+ * *
+ * @return An hashtable: whose keys are the names of the groups and whose
+ * corresponding values are lists of all the dictionnary entries
+ * among that group.
+ */
+std::map<std::string, std::list<std::string> > *
+ DictSet::GetPubDictEntryNamesByCategory()
+{
+ return GetDefaultPubDict()->GetDictEntryNamesByCategory();