X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmElementSet.h;h=030bbf562c07ae6b81571f68299f1f71a8154981;hb=45333140369db54d6e83087cc58be4b264b58b14;hp=0c1fd35774292797721591d22f5b86af39f60e85;hpb=3a55e1cf34bdbd1b10975432d648f81d9c6c048b;p=gdcm.git

diff --git a/src/gdcmElementSet.h b/src/gdcmElementSet.h
index 0c1fd357..030bbf56 100644
--- a/src/gdcmElementSet.h
+++ b/src/gdcmElementSet.h
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmElementSet.h,v $
   Language:  C++
-  Date:      $Date: 2004/07/19 03:34:12 $
-  Version:   $Revision: 1.11 $
+  Date:      $Date: 2005/01/06 20:03:27 $
+  Version:   $Revision: 1.28 $
                                                                                 
   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
@@ -19,44 +19,58 @@
 #ifndef GDCMELEMENTSET_H
 #define GDCMELEMENTSET_H
 
-#include <map>
-#include <iostream>
-#include "gdcmCommon.h"
 #include "gdcmDocEntrySet.h"
 
-class gdcmValEntry;
-class gdcmBinEntry;
-class gdcmSeqEntry;
+#include <map>
+#include <iostream>
+#include <fstream>
 
+namespace gdcm 
+{
+class ValEntry;
+class BinEntry;
+class SeqEntry;
 
-typedef std::map<gdcmTagKey, gdcmDocEntry *> TagDocEntryHT;
+typedef std::map<TagKey, DocEntry *> TagDocEntryHT;
 
 //-----------------------------------------------------------------------------
 
-class GDCM_EXPORT gdcmElementSet : public gdcmDocEntrySet
+class GDCM_EXPORT ElementSet : public DocEntrySet
 {
 public:
-   gdcmElementSet(int);
-   ~gdcmElementSet();
-   virtual bool AddEntry(gdcmDocEntry *Entry);
-   virtual bool RemoveEntry(gdcmDocEntry *EntryToRemove);
+   ElementSet(int);
+   ~ElementSet();
 
    virtual void Print(std::ostream &os = std::cout); 
-   virtual void Write(FILE *fp, FileType filetype); 
 
-   /// Accessor to \ref gdcmElementSet::tagHT
-   // Do not expose this to user (public API) !
-   //TagDocEntryHT &GetEntry() { return TagHT; };
+   bool AddEntry(DocEntry *Entry);
+   bool RemoveEntry(DocEntry *EntryToRemove);
+   bool RemoveEntryNoDestroy(DocEntry *EntryToRemove);
+   
+   void WriteContent(std::ofstream *fp, FileType filetype); 
+   
+   /// Accessor to \ref TagHT
+   // Do not expose this to user (public API) ! 
+   // A test is using it thus put it in public (matt)
+   TagDocEntryHT const &GetTagHT() const { return TagHT; };
+
+   void Initialize();
+   DocEntry *GetNextEntry();
 
 protected:
+    
+private:
 // Variables
    /// Hash Table (map), to provide fast access
    TagDocEntryHT TagHT; 
-     
-private:
-   //friend class gdcmDicomDir;
+   /// Hash Table (map) iterator, used to visit the TagHT variable
+   TagDocEntryHT::iterator ItTagHT; 
+ 
+   friend class Document;
+   friend class DicomDir; //For accessing private TagHT
+   friend class DocEntryArchive; //For accessing private TagHT
 };
-
+} // end namespace gdcm
 //-----------------------------------------------------------------------------
 #endif