X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictSet.h;h=9b5f3ab79c34cd7de55c186648b632394993d540;hb=0f683a63c5ba0c53a1077a6a61e8aa4b36c88d2b;hp=f725074dfef78b6e9fca404588bbf0e75d3377e5;hpb=1fecdc6dcc36f951de19246bd14ef282b3dec13a;p=gdcm.git diff --git a/src/gdcmDictSet.h b/src/gdcmDictSet.h index f725074d..9b5f3ab7 100644 --- a/src/gdcmDictSet.h +++ b/src/gdcmDictSet.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDictSet.h,v $ Language: C++ - Date: $Date: 2005/01/07 12:29:17 $ - Version: $Revision: 1.33 $ + Date: $Date: 2005/06/14 14:00:04 $ + Version: $Revision: 1.43 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -30,9 +30,8 @@ namespace gdcm typedef std::map DictSetHT; //----------------------------------------------------------------------------- -/* - * \defgroup DictSet - * \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 @@ -44,29 +43,32 @@ public: DictSet(); ~DictSet(); - void Print(std::ostream &os); + void Print(std::ostream &os = std::cout, std::string const &indent = "" ); // Probabely useless ! //EntryNamesList *GetPubDictEntryNames(); - //EntryNamesByCatMap* GetPubDictEntryNamesByCategory(); + //EntryNamesByCatMap *GetPubDictEntryNamesByCategory(); Dict *LoadDictFromFile( std::string const &fileName, DictKey const &name ); Dict *GetDict( DictKey const &DictName ); - /// \brief Retrieve the default reference DICOM V3 public dictionary. + /// \brief Returns the default reference DICOM V3 public dictionary. Dict* GetDefaultPubDict() { return GetDict(PUB_DICT_NAME); }; - // \brief Retrieve the virtual reference DICOM dictionary. - // \warning : not end user intended - // Dict *GetVirtualDict() { return &VirtualEntry; }; + // \ brief Returns the virtual references DICOM dictionary. + // \ warning : not end user intended + // Dict *GetVirtualDict() { return &VirtualEntries; }; - DictEntry *NewVirtualDictEntry(uint16_t group, uint16_t element, + DictEntry *NewVirtualDictEntry(uint16_t group, uint16_t elem, TagName vr = GDCM_UNKNOWN, TagName vm = GDCM_UNKNOWN, TagName name = GDCM_UNKNOWN); + Dict *GetFirstEntry(); + Dict *GetNextEntry(); + static std::string BuildDictPath(); protected: @@ -75,12 +77,13 @@ protected: private: /// 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 DictEntries - TagKeyHT VirtualEntry; + TagKeyHT VirtualEntries; }; } // end namespace gdcm