Fix mistypings

[gdcm.git] / src / gdcmElementSet.h

diff --git a/src/gdcmElementSet.h b/src/gdcmElementSet.h
index 4bf25ae86b7d91c97741c16a27b61d0676c1b1b1..397f342c5290e650b61ac76b8f94f9f6e20d2d3d 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/12 04:35:46 $
-  Version:   $Revision: 1.19 $
+  Date:      $Date: 2007/09/17 12:16:02 $
+  Version:   $Revision: 1.59 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,54 +16,65 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMELEMENTSET_H
-#define GDCMELEMENTSET_H
+#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 
+namespace GDCM_NAME_SPACE 
 {
-
-
 typedef std::map<TagKey, DocEntry *> TagDocEntryHT;
 
 //-----------------------------------------------------------------------------
-
+/**
+ * \brief
+ *  ElementSet is based on the STL map<> container
+ * (see  ElementSet::TagHT), as opposed to  SQItem
+ * which is based on an STL list container (see  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 insideMetaElements, bool insideSequence); 
+
+   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(FILE *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
 //-----------------------------------------------------------------------------