X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDict.h;h=a1e72aadb9620065af13c146cb4f8019f09af9fa;hb=f3252c8bfb8ee8d4a7bf5f896a919f601a5fd9f7;hp=ee039f56d966b378e8fb41906cc4e1415a90c1e2;hpb=e8caac199c2683cb0f118c42c61dc6aec85b1eec;p=gdcm.git

diff --git a/src/gdcmDict.h b/src/gdcmDict.h
index ee039f56..a1e72aad 100644
--- a/src/gdcmDict.h
+++ b/src/gdcmDict.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDict.h,v $
   Language:  C++
-  Date:      $Date: 2005/01/16 04:50:41 $
-  Version:   $Revision: 1.32 $
+  Date:      $Date: 2007/05/23 14:18:09 $
+  Version:   $Revision: 1.50 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -19,25 +19,23 @@
 #ifndef GDCMDICT_H
 #define GDCMDICT_H
 
-#include "gdcmBase.h"
+#include "gdcmRefCounter.h"
 #include "gdcmDictEntry.h"
 
 #include <iostream>
+#include <fstream> // for ifstream
 #include <list>
 #include <map>
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 
 //-----------------------------------------------------------------------------
 typedef std::string DictKey;
-typedef std::map<TagKey, DictEntry>  TagKeyHT;
-typedef std::list<std::string>       EntryNamesList;
-typedef std::map<std::string, 
-            std::list<std::string> > EntryNamesByCatMap;
+typedef std::map<TagKey, DictEntry *>  TagKeyHT;
+
 //-----------------------------------------------------------------------------
 /**
- * \ingroup 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.
@@ -46,42 +44,49 @@ typedef std::map<std::string,
  *           combined with all software versions...
  * \see DictSet
  */
-class GDCM_EXPORT Dict : public Base
+class GDCM_EXPORT Dict : public RefCounter
 {
+   gdcmTypeMacro(Dict);
+
 public:
-   Dict(void);
-   Dict(std::string const & filename);
-   ~Dict();
+/// \brief Contructs an empty Dict with a RefCounter
+   static Dict *New() {return new Dict();}
+/// \brief Contructs a Dict with a RefCounter
+   static Dict *New(std::string const &filename) {return new Dict(filename);}
 
+   bool AddDict(std::string const &filename);
+   bool RemoveDict(std::string const &filename);
 // Print
-   void Print(std::ostream &os = std::cout, std::string const & indent = "");
+   void Print(std::ostream &os = std::cout, std::string const &indent = "");
 
 // Entries
-   void ClearEntry  ();
-   bool AddNewEntry (DictEntry const &newEntry);
-   bool ReplaceEntry(DictEntry const &newEntry);
+   bool AddEntry(DictEntry *newEntry);
+  // bool ReplaceEntry(DictEntry *newEntry); // useless ?
    bool RemoveEntry (TagKey const &key);
-   bool RemoveEntry (uint16_t group, uint16_t element);
+   bool RemoveEntry (uint16_t group, uint16_t elem);
+   void ClearEntry();
    
 // Tag
-   DictEntry *GetDictEntry(uint16_t group, uint16_t element);
-
-  // EntryNamesList *GetDictEntryNames();
-  // EntryNamesByCatMap *GetDictEntryNamesByCategory();
+   DictEntry *GetEntry(uint16_t group, uint16_t elem);
+   DictEntry *GetEntry(TagKey const &key);
 
-   /// \brief  Returns a ref to the Dicom Dictionary H table (map)
-   /// @return the Dicom Dictionary H table
-   //const TagKeyHT & GetEntries() const { return KeyHt; }
-
-   void InitTraversal();
+   DictEntry *GetFirstEntry();
    DictEntry *GetNextEntry();
 
+protected:
+   Dict();
+   Dict(std::string const &filename);
+   ~Dict();
+
 private:
+   void DoTheLoadingJob(std::ifstream &ifs);
+
    /// ASCII file holding the Dictionnary
    std::string Filename;
 
    /// Access through TagKey
    TagKeyHT KeyHt;
+   /// Iterator for the entries
    TagKeyHT::iterator ItKeyHt;
 };
 } // end namespace gdcm