Coding Style + Doxygenation

[gdcm.git] / src / gdcmElementSet.h

diff --git a/src/gdcmElementSet.h b/src/gdcmElementSet.h
index c1da9457d10441695996b84172e2d9ab9b02dccf..030bbf562c07ae6b81571f68299f1f71a8154981 100644 (file)
--- 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/25 04:47:43 $
-  Version:   $Revision: 1.21 $
+  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
@@ -19,17 +19,18 @@
 #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;
 
 //-----------------------------------------------------------------------------
@@ -40,17 +41,21 @@ public:
    ElementSet(int);
    ~ElementSet();
 
+   virtual void Print(std::ostream &os = std::cout); 
+
    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); 
+   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; };
+   TagDocEntryHT const &GetTagHT() const { return TagHT; };
+
+   void Initialize();
+   DocEntry *GetNextEntry();
 
 protected:
     
@@ -58,9 +63,12 @@ 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 DocEntryArchive; //For accessing private TagHT
 };
 } // end namespace gdcm
 //-----------------------------------------------------------------------------