X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmElementSet.h;h=fe681ee4311e99d571e120698488c1b381eccbaa;hb=fa8fa610de8d935491343df2d8a543ff6fdb6e69;hp=4123aaeefd7d1f0db08152fbaf451658ff045756;hpb=fd37aa842b5d31ca266b6bda8a77f3201d02338d;p=gdcm.git

diff --git a/src/gdcmElementSet.h b/src/gdcmElementSet.h
index 4123aaee..fe681ee4 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/09/27 08:39:07 $
-  Version:   $Revision: 1.17 $
+  Date:      $Date: 2005/09/02 07:10:03 $
+  Version:   $Revision: 1.45 $
                                                                                 
   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 <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
+/**
+ * \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:
-   gdcmElementSet(int);
-   ~gdcmElementSet();
-   virtual bool AddEntry(gdcmDocEntry *Entry);
-   bool RemoveEntry(gdcmDocEntry *EntryToRemove);
-   bool RemoveEntryNoDestroy(gdcmDocEntry *EntryToRemove);
-   
-   virtual void Print(std::ostream &os = std::cout); 
-   virtual void Write(FILE *fp, FileType filetype); 
+   ElementSet(int);
+   ~ElementSet();
 
-   /// Accessor to \ref TagHT
-   // Do not expose this to user (public API) !
-   // I re-add it temporaryly JPRx
-   TagDocEntryHT &GetEntry() { return TagHT; };
+   virtual void Print(std::ostream &os = std::cout, 
+                      std::string const &indent = "" ); 
 
+   void WriteContent(std::ofstream *fp, FileType filetype); 
+
+   bool AddEntry(DocEntry *Entry);
+   bool RemoveEntry(DocEntry *EntryToRemove);
+   bool RemoveEntryNoDestroy(DocEntry *EntryToRemove);
+   void ClearEntry();
+   
+   DocEntry *GetFirstEntry();
+   DocEntry *GetNextEntry();
+   DocEntry *GetDocEntry(uint16_t group, uint16_t elem);
+   /// Tells us if the ElementSet contains no entry
+   bool IsEmpty() { return TagHT.empty(); }
 
 protected:
+
+private:
 // Variables
    /// Hash Table (map), to provide fast access
-   TagDocEntryHT TagHT; 
-     
-private:
-   /// Just for following ::GetTagHT()
-   friend class gdcmDocument;
-
-   /// Accessor to \ref TagHT
-   TagDocEntryHT* GetTagHT() { return &TagHT; };
+   TagDocEntryHT TagHT;
+   /// iterator, used to visit the TagHT variable
+   TagDocEntryHT::iterator ItTagHT;
+   /// iterator, used to visit the TagHT variable, seeking only for ValEntries
+   TagDocEntryHT::iterator ItValEntryTagHT;
 };
-
+} // end namespace gdcm
 //-----------------------------------------------------------------------------
 #endif