X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmElementSet.h;h=397f342c5290e650b61ac76b8f94f9f6e20d2d3d;hb=f2dd0107ba49eda3386b34715cdc0c046d12397f;hp=985adfdc2082eb9f48551f4906bed23b3660ade8;hpb=3c51b39e18ba55faf14c5bbac129662e824d3adb;p=gdcm.git

diff --git a/src/gdcmElementSet.h b/src/gdcmElementSet.h
index 985adfdc..397f342c 100644
--- a/src/gdcmElementSet.h
+++ b/src/gdcmElementSet.h
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmElementSet.h,v $
   Language:  C++
-  Date:      $Date: 2004/09/03 04:16:29 $
-  Version:   $Revision: 1.12 $
+  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
-  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
                                                                                 
      This software is distributed WITHOUT ANY WARRANTY; without even
      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
@@ -16,47 +16,67 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMELEMENTSET_H
-#define GDCMELEMENTSET_H
+#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>
 
-typedef std::map<gdcmTagKey, gdcmDocEntry *> TagDocEntryHT;
+namespace GDCM_NAME_SPACE 
+{
+typedef std::map<TagKey, DocEntry *> TagDocEntryHT;
 
 //-----------------------------------------------------------------------------
-
-class GDCM_EXPORT gdcmElementSet : public gdcmDocEntrySet
+/**
+ * \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:
-   gdcmElementSet(int);
-   ~gdcmElementSet();
-   virtual bool AddEntry(gdcmDocEntry *Entry);
-   virtual bool RemoveEntry(gdcmDocEntry *EntryToRemove);
+   virtual void Print(std::ostream &os = std::cout, 
+                      std::string const &indent = "" ); 
+
+   void WriteContent(std::ofstream *fp, FileType filetype,
+                                    bool insideMetaElements, bool insideSequence); 
 
-   virtual void Print(std::ostream &os = std::cout); 
-   virtual void Write(FILE *fp, FileType filetype); 
+   bool AddEntry(DocEntry *Entry);
+   bool RemoveEntry(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(); }
+   
+   int IsVRCoherent(uint16_t group);
 
-   /// Accessor to \ref gdcmElementSet::tagHT
-   // Do not expose this to user (public API) !
-   TagDocEntryHT &GetEntry() { return TagHT; };
+   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:
-   //friend class gdcmDicomDir;
+   TagDocEntryHT TagHT;
+   /// iterator, used to visit the TagHT variable
+   TagDocEntryHT::iterator ItTagHT;
 };
-
+} // end namespace gdcm
 //-----------------------------------------------------------------------------
 #endif