X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmElementSet.h;h=7a4e5124430e67d41ada5c01f0c4bc8354e127f2;hb=d5e16925a7d3c8dbd0e71b1989629ca0f619b119;hp=c76fefee9fe956a9682321c0bc924c96b1f8affd;hpb=fea9426f960497d2d9124ab532d2097f2915678f;p=gdcm.git

diff --git a/src/gdcmElementSet.h b/src/gdcmElementSet.h
index c76fefee..7a4e5124 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/10/22 03:05:41 $
-  Version:   $Revision: 1.20 $
+  Date:      $Date: 2005/01/16 04:50:41 $
+  Version:   $Revision: 1.31 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -19,51 +19,62 @@
 #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 bool AddEntry(DocEntry *Entry);
+
+   virtual void Print(std::ostream &os = std::cout, std::string const & indent = "" ); 
+
+   bool AddEntry(DocEntry *Entry);
    bool RemoveEntry(DocEntry *EntryToRemove);
    bool RemoveEntryNoDestroy(DocEntry *EntryToRemove);
    
-   virtual void Print(std::ostream &os = std::cout); 
-   virtual void Write(std::ofstream *fp, FileType filetype); 
-
+   void WriteContent(std::ofstream *fp, FileType filetype); 
+   
    /// Accessor to \ref TagHT
-   // Do not expose this to user (public API) !
-   // I re-add it temporaryly JPRx
-   TagDocEntryHT &GetEntry() { return 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 InitTraversal();
+   DocEntry *GetNextEntry();
 
 protected:
+    
+private:
 // Variables
    /// Hash Table (map), to provide fast access
    TagDocEntryHT TagHT; 
-     
-private:
-   /// Just for following ::GetTagHT()
+   /// Hash Table (map) iterator, used to visit the TagHT variable
+   TagDocEntryHT::iterator ItTagHT; 
+ 
    friend class Document;
-
-   /// Accessor to \ref TagHT
-   TagDocEntryHT* GetTagHT() { return &TagHT; };
+   friend class DicomDir; //For accessing private TagHT
+   friend class DocEntryArchive; //For accessing private TagHT
 };
 } // end namespace gdcm
 //-----------------------------------------------------------------------------