X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDict.h;h=36e579843f1aede15142ecb70ddf0c2b20208a3f;hb=8f38e5061bcb7bebaea78024d8d743ab973e2dab;hp=6764bbd40da206df1ec9259f1b147bff5d215f4b;hpb=ba78e6c6d47d6db1528e8e88e5ebde7296a26692;p=gdcm.git diff --git a/src/gdcmDict.h b/src/gdcmDict.h index 6764bbd4..36e57984 100644 --- a/src/gdcmDict.h +++ b/src/gdcmDict.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDict.h,v $ Language: C++ - Date: $Date: 2004/12/03 20:16:57 $ - Version: $Revision: 1.24 $ + Date: $Date: 2005/02/02 15:07:41 $ + Version: $Revision: 1.37 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -19,6 +19,7 @@ #ifndef GDCMDICT_H #define GDCMDICT_H +#include "gdcmBase.h" #include "gdcmDictEntry.h" #include @@ -31,62 +32,49 @@ namespace gdcm //----------------------------------------------------------------------------- typedef std::string DictKey; typedef std::map TagKeyHT; -typedef std::map TagNameHT; -typedef std::list EntryNamesList; -typedef std::map > EntryNamesByCatMap; +//typedef std::list EntryNamesList; +//typedef std::map > EntryNamesByCatMap; //----------------------------------------------------------------------------- -/* - * \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. + * 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 DictSet */ -class GDCM_EXPORT Dict +class GDCM_EXPORT Dict : public Base { public: - Dict(std::string const & filename); + 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 (DictEntry const & newEntry); - bool ReplaceEntry(DictEntry const & newEntry); - bool RemoveEntry (TagKey const & 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 - DictEntry *GetDictEntryByName(TagName const & name); - DictEntry *GetDictEntryByNumber(uint16_t group, uint16_t element); + DictEntry *GetEntry(uint16_t group, uint16_t elem); - EntryNamesList *GetDictEntryNames(); - EntryNamesByCatMap *GetDictEntryNamesByCategory(); + DictEntry *GetFirstEntry(); + DictEntry *GetNextEntry(); - /// \brief Returns a ref to the Dicom Dictionary H table (map) - /// @return the Dicom Dictionary H table - const TagKeyHT & GetEntriesByKey() const { return KeyHt; } - - /// \brief Returns a ref to the Dicom Dictionary H table (map) - /// @return the Dicom Dictionary H table - const TagNameHT & GetEntriesByName() const { return NameHt; } - private: /// ASCII file holding the Dictionnary std::string Filename; - /// Access through TagKey (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