X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDict.h;h=d42548c05a365fdaa04d50bb248efb97ea63303d;hb=c67ffef593e7635d8dfa7d3fe63d702e5afafc3e;hp=dfab30c3557c9423fcd9aabf2c45b3aa48628411;hpb=05abd393cf82392c894dd1d852e2273b0648671d;p=gdcm.git

diff --git a/src/gdcmDict.h b/src/gdcmDict.h
index dfab30c3..d42548c0 100644
--- a/src/gdcmDict.h
+++ b/src/gdcmDict.h
@@ -1,45 +1,83 @@
-// gdcmDict.h
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmDict.h,v $
+  Language:  C++
+  Date:      $Date: 2005/01/24 14:14:11 $
+  Version:   $Revision: 1.35 $
+                                                                                
+  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.html for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
 
 #ifndef GDCMDICT_H
 #define GDCMDICT_H
 
-#include <map>
-#include "gdcmCommon.h"
+#include "gdcmBase.h"
 #include "gdcmDictEntry.h"
 
-typedef std::map<TagKey,  gdcmDictEntry*> TagKeyHT;
-typedef std::map<TagName, gdcmDictEntry*> TagNameHT;
+#include <iostream>
+#include <list>
+#include <map>
+
+namespace gdcm 
+{
 
-/*
- * \defgroup gdcmDict
- * \brief    gdcmDict 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.
+//-----------------------------------------------------------------------------
+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;
+//-----------------------------------------------------------------------------
+/**
+ * \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.
  *           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 {
-   std::string name;
-   std::string filename;
-   /// Access through TagKey (see alternate access with NameHt)
-	TagKeyHT  KeyHt;
-   /// Access through TagName (see alternate access with KeyHt)
-	TagNameHT NameHt;
+class GDCM_EXPORT Dict : public Base
+{
 public:
-	gdcmDict(std::string & FileName);
-	~gdcmDict();
-	int AddNewEntry (gdcmDictEntry* NewEntry);
-	int ReplaceEntry(gdcmDictEntry* NewEntry);
-	int RemoveEntry (TagKey key);
-	int RemoveEntry (guint16 group, guint16 element);
-	gdcmDictEntry * GetTagByNumber(guint16 group, guint16 element);
-	gdcmDictEntry * GetTagByName(TagName name);
-	void Print(ostream&);
-	void PrintByKey(ostream&);
-	void PrintByName(ostream&);
-	TagKeyHT & GetEntries(void) { return KeyHt; }
+   Dict(void);
+   Dict(std::string const & filename);
+   ~Dict();
+
+// 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 RemoveEntry (TagKey const &key);
+   bool RemoveEntry (uint16_t group, uint16_t elem);
+   
+// Tag
+   DictEntry *GetEntry(uint16_t group, uint16_t elem);
+
+   DictEntry *GetFirstEntry();
+   DictEntry *GetNextEntry();
+
+private:
+   /// ASCII file holding the Dictionnary
+   std::string Filename;
+
+   /// Access through TagKey
+   TagKeyHT KeyHt;
+   TagKeyHT::iterator ItKeyHt;
 };
+} // end namespace gdcm
 
+//-----------------------------------------------------------------------------
 #endif