X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictSet.h;h=28cc210dde6e4cdb62063c4cdc51d80d28d71589;hb=67845c7dc1241480f5c5fcfa0cfc2e86918dad1e;hp=c4cca7c9944541ff74a64f19140eb332423961cd;hpb=2012716d624d631dcdb825fdd4470908e115a717;p=gdcm.git

diff --git a/src/gdcmDictSet.h b/src/gdcmDictSet.h
index c4cca7c9..28cc210d 100644
--- a/src/gdcmDictSet.h
+++ b/src/gdcmDictSet.h
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDictSet.h,v $
   Language:  C++
-  Date:      $Date: 2004/06/20 18:08:47 $
-  Version:   $Revision: 1.20 $
+  Date:      $Date: 2004/09/27 08:39:06 $
+  Version:   $Revision: 1.26 $
                                                                                 
   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
@@ -35,38 +35,39 @@ typedef std::map<DictKey, gdcmDict*> DictSetHT;
  * \par    having many in memory representations of the same dictionary
  *        (saving memory).
  */
-class GDCM_EXPORT gdcmDictSet {
+class GDCM_EXPORT gdcmDictSet
+{
 public:
-	// TODO Swig int LoadDictFromFile(std::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(std::string filename);
-	// TODO Swig int LoadAllDictFromDirectory(std::string DirectoryName);
-	// TODO Swig std::string* GetAllDictNames();
-   gdcmDictSet(void);
-   ~gdcmDictSet(void);
+   gdcmDictSet();
+   ~gdcmDictSet();
 
    void Print(std::ostream& os);
 
-   std::list<std::string> *GetPubDictEntryNames(void);
+   std::list<std::string>* GetPubDictEntryNames();
    std::map<std::string, std::list<std::string> > *
-       GetPubDictEntryNamesByCategory(void);
+       GetPubDictEntryNamesByCategory();
 
-   gdcmDict *LoadDictFromFile(std::string FileName, DictKey Name);
+   gdcmDict* LoadDictFromFile( std::string const & fileName,
+                               DictKey const & name );
 
-   gdcmDict *GetDict(DictKey DictName);
-   gdcmDict *GetDefaultPubDict(void);
+   gdcmDict* GetDict( DictKey const & DictName );
 
-   gdcmDictEntry *NewVirtualDictEntry(guint16 group, guint16 element,
+   /// \brief   Retrieve the default reference DICOM V3 public dictionary.
+   gdcmDict* GetDefaultPubDict() { return GetDict(PUB_DICT_NAME); };
+
+   // \brief   Retrieve the virtual reference DICOM dictionary.
+   // \warning : not end user intended
+   // gdcmDict* GetVirtualDict() { return &VirtualEntry; };
+
+   gdcmDictEntry* NewVirtualDictEntry(uint16_t group, uint16_t element,
                                       std::string vr     = "Unknown",
                                       std::string fourth = "Unknown",
                                       std::string name   = "Unknown");
 
-   static std::string BuildDictPath(void);
+   static std::string BuildDictPath();
 
 protected:
-   bool AppendDict(gdcmDict *NewDict,DictKey Name);
+   bool AppendDict(gdcmDict *NewDict, DictKey const & name);
 
 private:
    /// Hash table of all dictionaries contained in this gdcmDictSet
@@ -74,7 +75,7 @@ private:
    /// Directory path to dictionaries
    std::string DictPath;
    /// H table for the on the fly created gdcmDictEntries  
-   std::map<std::string,gdcmDictEntry *> virtualEntry;
+   TagKeyHT VirtualEntry; 
 };
 
 //-----------------------------------------------------------------------------