Program: gdcm
Module: $RCSfile: gdcmDictSet.h,v $
Language: C++
- Date: $Date: 2004/06/20 18:08:47 $
- Version: $Revision: 1.20 $
+ 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.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
#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;
+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 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 = "" );
+
+ // Probabely useless !
+ //EntryNamesList *GetPubDictEntryNames();
+ //EntryNamesByCatMap *GetPubDictEntryNamesByCategory();
- void Print(std::ostream& os);
+ Dict *LoadDictFromFile( std::string const &fileName,
+ DictKey const &name );
- std::list<std::string> *GetPubDictEntryNames(void);
- std::map<std::string, std::list<std::string> > *
- GetPubDictEntryNamesByCategory(void);
+ Dict *GetDict( DictKey const &DictName );
- gdcmDict *LoadDictFromFile(std::string FileName, DictKey Name);
+ /// \brief Returns the default reference DICOM V3 public dictionary.
+ Dict* GetDefaultPubDict() { return GetDict(PUB_DICT_NAME); };
- gdcmDict *GetDict(DictKey DictName);
- gdcmDict *GetDefaultPubDict(void);
+ // \ brief Returns the virtual references DICOM dictionary.
+ // \ warning : not end user intended
+ // Dict *GetVirtualDict() { return &VirtualEntries; };
- gdcmDictEntry *NewVirtualDictEntry(guint16 group, guint16 element,
- std::string vr = "Unknown",
- std::string fourth = "Unknown",
- std::string name = "Unknown");
+ DictEntry *NewVirtualDictEntry(uint16_t group, uint16_t elem,
+ TagName vr = GDCM_UNKNOWN,
+ TagName vm = GDCM_UNKNOWN,
+ TagName name = GDCM_UNKNOWN);
- static std::string BuildDictPath(void);
+ Dict *GetFirstEntry();
+ Dict *GetNextEntry();
+
+ 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;
+ 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;
+
+ /// H table for the on the fly created DictEntries
+ ExtendedTagKeyHT VirtualEntries;
};
+} // end namespace gdcm
//-----------------------------------------------------------------------------
#endif