X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmElementSet.h;h=2b7cc0c97b9c7652392b6a88b3faa4facf77e8df;hb=130558c1fc10cbc2d5d58484b310fa86bd20d81b;hp=926bec2c619623727af84cdaffd471fbcd8c8994;hpb=3c25b6a04715c20b3680bca5447b4f10add258fd;p=gdcm.git

diff --git a/src/gdcmElementSet.h b/src/gdcmElementSet.h
index 926bec2c..2b7cc0c9 100644
--- a/src/gdcmElementSet.h
+++ b/src/gdcmElementSet.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmElementSet.h,v $
   Language:  C++
-  Date:      $Date: 2004/11/19 18:49:39 $
-  Version:   $Revision: 1.22 $
+  Date:      $Date: 2005/01/18 18:03:17 $
+  Version:   $Revision: 1.33 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -19,38 +19,44 @@
 #ifndef GDCMELEMENTSET_H
 #define GDCMELEMENTSET_H
 
-#include "gdcmCommon.h"
 #include "gdcmDocEntrySet.h"
+
 #include <map>
 #include <iostream>
+#include <fstream>
 
+namespace gdcm 
+{
 class ValEntry;
 class BinEntry;
 class SeqEntry;
 
-namespace gdcm 
-{
 typedef std::map<TagKey, DocEntry *> TagDocEntryHT;
 
 //-----------------------------------------------------------------------------
-
+/**
+ * \brief
+ * \ref ElementSet is based on the STL map<> container
+ * (see \ref ElementSet::TagHT), as opposed to \ref SQItem
+ * which is based on an STL list container (see \ref ListDocEntry).
+ * It contains the 'zero-level- DocEntry (out of any Dicom Sequence)
+ */
 class GDCM_EXPORT ElementSet : public DocEntrySet
 {
 public:
    ElementSet(int);
    ~ElementSet();
 
+   virtual void Print(std::ostream &os = std::cout, std::string const &indent = "" ); 
+
    bool AddEntry(DocEntry *Entry);
    bool RemoveEntry(DocEntry *EntryToRemove);
    bool RemoveEntryNoDestroy(DocEntry *EntryToRemove);
    
-   void Print(std::ostream &os = std::cout); 
-   void Write(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 WriteContent(std::ofstream *fp, FileType filetype); 
+
+   DocEntry *GetFirstEntry();
+   DocEntry *GetNextEntry();
 
 protected:
     
@@ -58,9 +64,11 @@ private:
 // Variables
    /// Hash Table (map), to provide fast access
    TagDocEntryHT TagHT; 
+   /// 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 DicomDir;        //For accessing private TagHT
    friend class DocEntryArchive; //For accessing private TagHT
 };
 } // end namespace gdcm