BUG: Fix bug for Philips NTSCAN, this was fixed everywhere except the main tree...

[gdcm.git] / src / gdcmElementSet.h

diff --git a/src/gdcmElementSet.h b/src/gdcmElementSet.h
index 6d93e2c056f56c1f09aec816b02da99dffad02cd..cfc921bd52a70c28479459d12b7c1f295afc7fe9 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/11/24 10:23:47 $
-  Version:   $Revision: 1.23 $
+  Date:      $Date: 2005/01/11 15:15:38 $
+  Version:   $Revision: 1.29 $
                                                                                 
   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,46 @@
 #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); 
+
    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();