X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmElementSet.h;h=75e92dda218bab1401e5e183e365ea0e316b1c68;hb=3842530aeeb5ab67f9d7b0f1754108fd176ee51a;hp=6e96cb77d16e5fc3d4220e8e38e462755a4b5558;hpb=1bae8d2ba47d1b9cc8acfb7b5ab82026e48275dd;p=gdcm.git

diff --git a/src/gdcmElementSet.h b/src/gdcmElementSet.h
index 6e96cb77..75e92dda 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/11/25 15:46:11 $
-  Version:   $Revision: 1.24 $
+  Date:      $Date: 2005/10/26 13:00:15 $
+  Version:   $Revision: 1.51 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -19,54 +19,59 @@
 #ifndef GDCMELEMENTSET_H
 #define GDCMELEMENTSET_H
 
-#include "gdcmCommon.h"
 #include "gdcmDocEntrySet.h"
+
 #include <map>
 #include <iostream>
-
-class ValEntry;
-class BinEntry;
-class SeqEntry;
+#include <fstream>
 
 namespace gdcm 
 {
+class SeqEntry;
+
 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 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();
    
-   void Print(std::ostream &os = std::cout); 
-   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; };
-
-   void Initialize();
+   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:
-    
+   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; 
-   /// 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
+   TagDocEntryHT TagHT;
+   /// iterator, used to visit the TagHT variable
+   TagDocEntryHT::iterator ItTagHT;
 };
 } // end namespace gdcm
 //-----------------------------------------------------------------------------