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

diff --git a/src/gdcmElementSet.h b/src/gdcmElementSet.h
index c76fefee..ccf78090 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: 2006/01/31 11:39:47 $
+  Version:   $Revision: 1.54 $
                                                                                 
   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,61 @@
 #ifndef GDCMELEMENTSET_H
 #define GDCMELEMENTSET_H
 
-#include "gdcmCommon.h"
 #include "gdcmDocEntrySet.h"
+
 #include <map>
 #include <iostream>
+#include <fstream>
 
-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
 {
+   gdcmTypeMacro(ElementSet);
+
 public:
-   ElementSet(int);
-   ~ElementSet();
-   virtual bool AddEntry(DocEntry *Entry);
+   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();
    
-   virtual void Print(std::ostream &os = std::cout); 
-   virtual void Write(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; };
+   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(); }
+   
+   int IsVRCoherent(uint16_t group);
 
+   virtual void Copy(DocEntrySet *set);
 
 protected:
+   ElementSet();
+   ~ElementSet();
+   /// \brief Some group are illegal withing some Dicom Documents
+   ///        Only the Document knows it.
+   bool MayIWrite(uint16_t )
+                 { return true; }
+private:
 // Variables
    /// Hash Table (map), to provide fast access
-   TagDocEntryHT TagHT; 
-     
-private:
-   /// Just for following ::GetTagHT()
-   friend class Document;
-
-   /// Accessor to \ref TagHT
-   TagDocEntryHT* GetTagHT() { return &TagHT; };
+   TagDocEntryHT TagHT;
+   /// iterator, used to visit the TagHT variable
+   TagDocEntryHT::iterator ItTagHT;
 };
 } // end namespace gdcm
 //-----------------------------------------------------------------------------