X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmDict.h;h=d72fec8df51e529bdad7e1a41f085bfe45bfa18f;hb=e7768bbebdc9a5972e396d71a3e848f5674ee378;hp=04e80eee97a30e926cb1ac2f289275fd9b609d25;hpb=1ce6ae86daabc8b64c9309acce4ecf137ee79f07;p=gdcm.git

diff --git a/src/gdcmDict.h b/src/gdcmDict.h
index 04e80eee..d72fec8d 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/31 12:19:33 $
-  Version:   $Revision: 1.36 $
+  Date:      $Date: 2007/08/22 16:14:03 $
+  Version:   $Revision: 1.51 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,25 +16,24 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMDICT_H
-#define GDCMDICT_H
+#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;
+
 //-----------------------------------------------------------------------------
 /**
  * \brief    Dict acts a memory representation of a dicom dictionary i.e.
@@ -45,35 +44,49 @@ typedef std::map<TagKey, DictEntry>  TagKeyHT;
  *           combined with all software versions...
  * \see DictSet
  */
-class GDCM_EXPORT Dict : public Base
+class GDCM_EXPORT Dict : public RefCounter
 {
+   gdcmTypeMacro(Dict);
+
 public:
-   Dict();
-   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 = "");
 
 // Entries
-   void ClearEntry  ();
-   bool AddEntry (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 elem);
+   void ClearEntry();
    
 // Tag
    DictEntry *GetEntry(uint16_t group, uint16_t elem);
+   DictEntry *GetEntry(TagKey const &key);
 
    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