ENH: Slightly bigger patch:

[gdcm.git] / src / gdcmDict.h

diff --git a/src/gdcmDict.h b/src/gdcmDict.h
index d5f9aea1493ff1c8283d0d1136be01cb1f95cb13..dd4910dc3451a8ea33fb6a52913d26c50e12717b 100644 (file)
--- a/src/gdcmDict.h
+++ b/src/gdcmDict.h
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDict.h,v $
   Language:  C++
-  Date:      $Date: 2004/07/28 21:23:20 $
-  Version:   $Revision: 1.17 $
+  Date:      $Date: 2004/11/16 02:54:35 $
+  Version:   $Revision: 1.23 $
                                                                                 
   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
@@ -26,26 +26,31 @@
 #include <list>
 #include <map>
 
-//-----------------------------------------------------------------------------
-typedef std::map<gdcmTagKey, gdcmDictEntry*> TagKeyHT;
-typedef std::map<TagName, gdcmDictEntry*> TagNameHT;
+namespace gdcm 
+{
 
+//-----------------------------------------------------------------------------
+typedef std::map<TagKey, DictEntry>  TagKeyHT;
+typedef std::map<TagName, DictEntry> TagNameHT;
+typedef std::list<std::string>       EntryNamesList;
+typedef std::map<std::string, 
+            std::list<std::string> > EntryNamesByCatMap;
 //-----------------------------------------------------------------------------
 /*
- * \defgroup gdcmDict
- * \brief    gdcmDict acts a memory representation of a dicom dictionary i.e.
+ * \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.
  *           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 gdcmDictSet
+ * \see DictSet
  */
-class GDCM_EXPORT gdcmDict
+class GDCM_EXPORT Dict
 {
 public:
-   gdcmDict(std::string const & FileName);
-   ~gdcmDict();
+   Dict(std::string const & filename);
+   ~Dict();
 
 // Print
    void Print(std::ostream &os = std::cout);
@@ -53,35 +58,37 @@ public:
    void PrintByName(std::ostream &os = std::cout);
 
 // Entries
-   bool AddNewEntry (gdcmDictEntry *NewEntry);
-   bool ReplaceEntry(gdcmDictEntry *NewEntry);
-   bool RemoveEntry (gdcmTagKey key);
+   bool AddNewEntry (DictEntry const & newEntry);
+   bool ReplaceEntry(DictEntry const & newEntry);
+   bool RemoveEntry (TagKey const & key);
    bool RemoveEntry (uint16_t group, uint16_t element);
    
 // Tag
-   gdcmDictEntry *GetDictEntryByName(TagName name);
-   gdcmDictEntry *GetDictEntryByNumber(uint16_t group, uint16_t element);
+   DictEntry *GetDictEntryByName(TagName const & name);
+   DictEntry *GetDictEntryByNumber(uint16_t group, uint16_t element);
 
-   std::list<std::string> *GetDictEntryNames();
-   std::map<std::string, std::list<std::string> > *
-        GetDictEntryNamesByCategory();
+   EntryNamesList *GetDictEntryNames();
+   EntryNamesByCatMap *GetDictEntryNamesByCategory();
 
    /// \brief  Returns a ref to the Dicom Dictionary H table (map)
    /// @return the Dicom Dictionary H table
-   TagKeyHT & GetEntriesByKey()  { return KeyHt; }
+   const TagKeyHT & GetEntriesByKey() const { return KeyHt; }
 
    /// \brief  Returns a ref to the Dicom Dictionary H table (map)
    /// @return the Dicom Dictionary H table
-   TagNameHT & GetEntriesByName()  { return NameHt; }
+   const TagNameHT & GetEntriesByName() const { return NameHt; }
  
 private:
    /// ASCII file holding the Dictionnary
    std::string Filename;
-   /// Access through gdcmTagKey (see alternate access with NameHt)
+
+   /// Access through TagKey (see alternate access with NameHt)
    TagKeyHT  KeyHt;
+
    /// Access through TagName (see alternate access with KeyHt)
    TagNameHT NameHt;
 };
+} // end namespace gdcm
 
 //-----------------------------------------------------------------------------
 #endif