Coding style : no more than 80 char per line!

[gdcm.git] / src / gdcmDict.h

diff --git a/src/gdcmDict.h b/src/gdcmDict.h
index 04e80eee97a30e926cb1ac2f289275fd9b609d25..316f7ccdea9867e8fe03e9f616a5a53cf847d5c3 100644 (file)
--- 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: 2005/09/03 18:24:10 $
+  Version:   $Revision: 1.41 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -23,6 +23,7 @@
 #include "gdcmDictEntry.h"
 
 #include <iostream>
+#include <fstream> // for ifstream
 #include <list>
 #include <map>
 
@@ -32,9 +33,6 @@ namespace gdcm
 //-----------------------------------------------------------------------------
 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;
 //-----------------------------------------------------------------------------
 /**
  * \brief    Dict acts a memory representation of a dicom dictionary i.e.
@@ -52,23 +50,28 @@ public:
    Dict(std::string const &filename);
    ~Dict();
 
+   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 AddEntry(DictEntry const &newEntry);
    bool ReplaceEntry(DictEntry const &newEntry);
    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();
 
 private:
+   void DoTheLoadingJob(std::ifstream &ifs);
+
    /// ASCII file holding the Dictionnary
    std::string Filename;