Program: gdcm
Module: $RCSfile: gdcmDict.h,v $
Language: C++
- Date: $Date: 2004/09/27 08:39:06 $
- Version: $Revision: 1.18 $
+ Date: $Date: 2004/12/16 13:46:37 $
+ Version: $Revision: 1.25 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#ifndef GDCMDICT_H
#define GDCMDICT_H
-#include "gdcmCommon.h"
+#include "gdcmBase.h"
#include "gdcmDictEntry.h"
#include <iostream>
#include <list>
#include <map>
-//-----------------------------------------------------------------------------
-typedef std::map<gdcmTagKey, gdcmDictEntry*> TagKeyHT;
-typedef std::map<TagName, gdcmDictEntry*> TagNameHT;
+namespace gdcm
+{
+//-----------------------------------------------------------------------------
+typedef std::string DictKey;
+typedef std::map<TagKey, DictEntry> TagKeyHT;
+typedef std::map<TagName, DictEntry> TagNameHT;
+typedef std::list<std::string> EntryNamesList;
+typedef std::map<std::string,
+ std::list<std::string> > EntryNamesByCatMap;
//-----------------------------------------------------------------------------
/*
- * \defgroup gdcmDict
- * \brief gdcmDict acts a memory representation of a dicom dictionary i.e.
+ * \defgroup Dict
+ * \brief Dict acts a memory representation of a dicom dictionary i.e.
* it is a container for a collection of dictionary entries. The
* dictionary is loaded from in an ascii file.
* There should be a single public dictionary (THE dictionary of
* the actual DICOM v3) but as many shadow dictionaries as imagers
* combined with all software versions...
- * \see gdcmDictSet
+ * \see DictSet
*/
-class GDCM_EXPORT gdcmDict
+class GDCM_EXPORT Dict : public Base
{
public:
- gdcmDict(std::string const & FileName);
- ~gdcmDict();
+ Dict(std::string const & filename);
+ ~Dict();
// Print
void Print(std::ostream &os = std::cout);
void PrintByName(std::ostream &os = std::cout);
// Entries
- bool AddNewEntry (gdcmDictEntry *NewEntry);
- bool ReplaceEntry(gdcmDictEntry *NewEntry);
- bool RemoveEntry (gdcmTagKey key);
+ bool AddNewEntry (DictEntry const & newEntry);
+ bool ReplaceEntry(DictEntry const & newEntry);
+ bool RemoveEntry (TagKey const & key);
bool RemoveEntry (uint16_t group, uint16_t element);
// Tag
- gdcmDictEntry *GetDictEntryByName(TagName name);
- gdcmDictEntry *GetDictEntryByNumber(uint16_t group, uint16_t element);
+ DictEntry *GetDictEntryByName(TagName const & name);
+ DictEntry *GetDictEntryByNumber(uint16_t group, uint16_t element);
- std::list<std::string> *GetDictEntryNames();
- std::map<std::string, std::list<std::string> > *
- GetDictEntryNamesByCategory();
+ EntryNamesList *GetDictEntryNames();
+ EntryNamesByCatMap *GetDictEntryNamesByCategory();
/// \brief Returns a ref to the Dicom Dictionary H table (map)
/// @return the Dicom Dictionary H table
- TagKeyHT & GetEntriesByKey() { return KeyHt; }
+ const TagKeyHT & GetEntriesByKey() const { return KeyHt; }
/// \brief Returns a ref to the Dicom Dictionary H table (map)
/// @return the Dicom Dictionary H table
- TagNameHT & GetEntriesByName() { return NameHt; }
+ const TagNameHT & GetEntriesByName() const { return NameHt; }
private:
/// ASCII file holding the Dictionnary
std::string Filename;
- /// Access through gdcmTagKey (see alternate access with NameHt)
+
+ /// Access through TagKey (see alternate access with NameHt)
TagKeyHT KeyHt;
+
/// Access through TagName (see alternate access with KeyHt)
TagNameHT NameHt;
};
+} // end namespace gdcm
//-----------------------------------------------------------------------------
#endif