X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictSet.h;h=414ef9900b374e8ac90e5de6d3a01937b1217882;hb=d5e16925a7d3c8dbd0e71b1989629ca0f619b119;hp=b2be826a7490b2410b9fc0e2eefdc4f612eb2ff3;hpb=f5c7e83afd484a025285c64a09a89bd227087245;p=gdcm.git diff --git a/src/gdcmDictSet.h b/src/gdcmDictSet.h index b2be826a..414ef990 100644 --- a/src/gdcmDictSet.h +++ b/src/gdcmDictSet.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDictSet.h,v $ Language: C++ - Date: $Date: 2004/12/16 13:46:37 $ - Version: $Revision: 1.30 $ + Date: $Date: 2005/01/16 04:50:41 $ + Version: $Revision: 1.36 $ 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,9 @@ namespace gdcm typedef std::map DictSetHT; //----------------------------------------------------------------------------- -/* - * \defgroup DictSet - * \brief Container for managing a set of loaded dictionaries. +/** + * \ingroup DictSet + * \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,32 +44,33 @@ public: DictSet(); ~DictSet(); - void Print(std::ostream& os); + void Print(std::ostream &os = std::cout, std::string const & indent = "" ); - EntryNamesList * GetPubDictEntryNames(); - EntryNamesByCatMap * GetPubDictEntryNamesByCategory(); + // Probabely useless ! + //EntryNamesList *GetPubDictEntryNames(); + //EntryNamesByCatMap* GetPubDictEntryNamesByCategory(); - Dict* LoadDictFromFile( std::string const & fileName, - DictKey const & name ); + Dict *LoadDictFromFile( std::string const &fileName, + DictKey const &name ); - Dict* GetDict( DictKey const & DictName ); + Dict *GetDict( DictKey const &DictName ); /// \brief Retrieve 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; }; + // Dict *GetVirtualDict() { return &VirtualEntry; }; - DictEntry* NewVirtualDictEntry(uint16_t group, uint16_t element, - TagName vr = "Unknown", - TagName fourth = "Unknown", - TagName name = "Unknown"); + DictEntry *NewVirtualDictEntry(uint16_t group, uint16_t element, + TagName vr = GDCM_UNKNOWN, + TagName vm = GDCM_UNKNOWN, + TagName name = GDCM_UNKNOWN); static std::string BuildDictPath(); protected: - bool AppendDict(Dict *NewDict, DictKey const & name); + bool AppendDict(Dict *NewDict, DictKey const &name); private: /// Hash table of all dictionaries contained in this DictSet