X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictSet.h;h=9e2e2d777580a759e99c168c6a4d5d67d0e32a82;hb=c1a305b54c1a9dd1bfe2173940ba84ccd1b4bb27;hp=c57ae16603bf1a34ee17a0e21ce150f880fee1d6;hpb=541ed5b2824ff14630565a474b1406e58b677662;p=gdcm.git diff --git a/src/gdcmDictSet.h b/src/gdcmDictSet.h index c57ae166..9e2e2d77 100644 --- a/src/gdcmDictSet.h +++ b/src/gdcmDictSet.h @@ -1,50 +1,90 @@ -// gdcmDictSet.h +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmDictSet.h,v $ + Language: C++ + Date: $Date: 2007/08/22 16:14:04 $ + Version: $Revision: 1.55 $ + + 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.html for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ -#ifndef GDCMDICTSET_H -#define GDCMDICTSET_H +#ifndef _GDCMDICTSET_H +#define _GDCMDICTSET_H + +#include "gdcmRefCounter.h" +#include "gdcmDict.h" +#include "gdcmGlobal.h" #include #include -#include "gdcmDict.h" -typedef string DictKey; -typedef map DictSetHT; +namespace GDCM_NAME_SPACE +{ +//----------------------------------------------------------------------------- +typedef std::map DictSetHT; -/* - * \defgroup gdcmDictSet - * \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 allready loaded dictionary (saving time) - * \par having many in memory representations of the same dictionary + * - reloading an already loaded dictionary (saving time) + * - having many in memory representations of the same dictionary * (saving memory). */ -class GDCM_EXPORT gdcmDictSet { -private: - DictSetHT dicts; - int AppendDict(gdcmDict* NewDict); - void LoadDictFromFile(string filename, DictKey); +class GDCM_EXPORT DictSet : public RefCounter +{ + gdcmTypeMacro(DictSet); + +public: +/// \brief Contructs a DictSet with a RefCounter + static DictSet *New() {return new DictSet();} + + void Print(std::ostream &os = std::cout, std::string const &indent = "" ); + + // Probabely useless ! + //EntryNamesList *GetPubDictEntryNames(); + //EntryNamesByCatMap *GetPubDictEntryNamesByCategory(); + + Dict *LoadDictFromFile( std::string const &fileName, + DictKey const &name ); + + Dict *GetDict( DictKey const &DictName ); + + /// \brief Returns the default reference DICOM V3 public dictionary. + //Dict* GetDefaultPubDict() { return GetDict(PUB_DICT_NAME); } + Dict* GetDefaultPubDict() { return Global::DefaultPubDict; } + + // \ brief Returns the virtual references DICOM dictionary. + // \ warning : not end user intended + // Dict *GetVirtualDict() { return &VirtualEntries; } + + Dict *GetFirstDict(); + Dict *GetNextDict(); + + static std::string BuildDictPath(); + +protected: + DictSet(); + ~DictSet(); + private: + /// Hash table of all dictionaries contained in this DictSet + DictSetHT Dicts; + /// Iterator to visit the Dictionaries of a given DictSet + DictSetHT::iterator ItDictHt; + /// Directory path to dictionaries - static string DictPath; - static string BuildDictPath(void); - static gdcmDict* DefaultPubDict; -public: - static list * GetPubDictTagNames(void); - static map >* GetPubDictTagNamesByCategory(void); - static gdcmDict* LoadDefaultPubDict(void); - - // TODO Swig int LoadDictFromFile(string filename); - // QUESTION: the following function might not be thread safe !? Maybe - // we need some mutex here, to avoid concurent creation of - // the same dictionary !?!?! - // TODO Swig int LoadDictFromName(string filename); - // TODO Swig int LoadAllDictFromDirectory(string DirectoryName); - // TODO Swig string* GetAllDictNames(); - gdcmDictSet(void); - ~gdcmDictSet(void); - void Print(ostream&); - gdcmDict* GetDict(DictKey DictName); - gdcmDict* GetDefaultPubDict(void); + std::string DictPath; }; +} // end namespace gdcm +//----------------------------------------------------------------------------- #endif