Program: gdcm
Module: $RCSfile: gdcmDict.h,v $
Language: C++
- Date: $Date: 2004/07/28 21:23:20 $
- Version: $Revision: 1.17 $
+ Date: $Date: 2005/05/11 15:01:47 $
+ Version: $Revision: 1.39 $
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 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
+{
//-----------------------------------------------------------------------------
-/*
- * \defgroup gdcmDict
- * \brief gdcmDict 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.
+typedef std::string DictKey;
+typedef std::map<TagKey, DictEntry> TagKeyHT;
+//-----------------------------------------------------------------------------
+/**
+ * \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();
+ Dict(std::string const &filename);
+ ~Dict();
// Print
- void Print(std::ostream &os = std::cout);
- void PrintByKey(std::ostream &os = std::cout);
- void PrintByName(std::ostream &os = std::cout);
+ void Print(std::ostream &os = std::cout, std::string const &indent = "");
// Entries
- bool AddNewEntry (gdcmDictEntry *NewEntry);
- bool ReplaceEntry(gdcmDictEntry *NewEntry);
- bool RemoveEntry (gdcmTagKey key);
- bool RemoveEntry (uint16_t group, uint16_t element);
+ bool AddEntry(DictEntry const &newEntry);
+ bool ReplaceEntry(DictEntry const &newEntry);
+ bool RemoveEntry (TagKey const &key);
+ bool RemoveEntry (uint16_t group, uint16_t elem);
+ void ClearEntry();
// Tag
- gdcmDictEntry *GetDictEntryByName(TagName name);
- gdcmDictEntry *GetDictEntryByNumber(uint16_t group, uint16_t element);
+ DictEntry *GetEntry(uint16_t group, uint16_t elem);
+ DictEntry *GetEntry(TagKey const &key);
- std::list<std::string> *GetDictEntryNames();
- std::map<std::string, std::list<std::string> > *
- GetDictEntryNamesByCategory();
+ DictEntry *GetFirstEntry();
+ DictEntry *GetNextEntry();
- /// \brief Returns a ref to the Dicom Dictionary H table (map)
- /// @return the Dicom Dictionary H table
- TagKeyHT & GetEntriesByKey() { return KeyHt; }
-
- /// \brief Returns a ref to the Dicom Dictionary H table (map)
- /// @return the Dicom Dictionary H table
- TagNameHT & GetEntriesByName() { return NameHt; }
-
private:
/// ASCII file holding the Dictionnary
std::string Filename;
- /// Access through gdcmTagKey (see alternate access with NameHt)
- TagKeyHT KeyHt;
- /// Access through TagName (see alternate access with KeyHt)
- TagNameHT NameHt;
+
+ /// Access through TagKey
+ TagKeyHT KeyHt;
+ TagKeyHT::iterator ItKeyHt;
};
+} // end namespace gdcm
//-----------------------------------------------------------------------------
#endif