X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmElementSet.h;h=332ca84bddfc8058f16ead2cfc1df37195a6870e;hb=4ae5f29bc5a2fa48c38fe43d331e5099aad4ed0f;hp=0bb3ac648593bea967e49265da2f237c6047c321;hpb=aaeee7164728ec0749a525f0c74274865712ec37;p=gdcm.git

diff --git a/src/gdcmElementSet.h b/src/gdcmElementSet.h
index 0bb3ac64..332ca84b 100644
--- a/src/gdcmElementSet.h
+++ b/src/gdcmElementSet.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmElementSet.h,v $
   Language:  C++
-  Date:      $Date: 2005/01/24 16:10:52 $
-  Version:   $Revision: 1.36 $
+  Date:      $Date: 2007/08/29 15:30:49 $
+  Version:   $Revision: 1.58 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMELEMENTSET_H
-#define GDCMELEMENTSET_H
+#ifndef _GDCMELEMENTSET_H_
+#define _GDCMELEMENTSET_H_
 
 #include "gdcmDocEntrySet.h"
 
@@ -25,12 +25,8 @@
 #include <iostream>
 #include <fstream>
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
-class ValEntry;
-class BinEntry;
-class SeqEntry;
-
 typedef std::map<TagKey, DocEntry *> TagDocEntryHT;
 
 //-----------------------------------------------------------------------------
@@ -43,49 +39,42 @@ typedef std::map<TagKey, DocEntry *> TagDocEntryHT;
  */
 class GDCM_EXPORT ElementSet : public DocEntrySet
 {
+   gdcmTypeMacro(ElementSet);
+
 public:
-   ElementSet(int);
-   ~ElementSet();
+   virtual void Print(std::ostream &os = std::cout, 
+                      std::string const &indent = "" ); 
 
-   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();
    
-   void WriteContent(std::ofstream *fp, FileType filetype); 
-
    DocEntry *GetFirstEntry();
    DocEntry *GetNextEntry();
-   DocEntry *GetLastEntry();
-   DocEntry *GetPreviousEntry();
-
    DocEntry *GetDocEntry(uint16_t group, uint16_t elem);
-   ValEntry *GetValEntry(uint16_t group, uint16_t elem);
-   BinEntry *GetBinEntry(uint16_t group, uint16_t elem);
-   SeqEntry *GetSeqEntry(uint16_t group, uint16_t elem);
-
-   bool IsEmpty() { return TagHT.empty(); };
-   bool CheckIfEntryExist(uint16_t group, uint16_t elem);
-
-   std::string GetEntryValue(uint16_t group, uint16_t elem);
-   int GetEntryLength(uint16_t group, uint16_t elem);
-   std::string GetEntryVR(uint16_t group, uint16_t elem);
+   /// Tells us if the ElementSet contains no entry
+   bool IsEmpty() { return TagHT.empty(); }
+   
+   int IsVRCoherent(uint16_t group);
 
-   bool SetEntryValue(std::string const& content, 
-                      uint16_t group, uint16_t elem);
+   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; 
-   /// Hash Table (map) iterator, used to visit the TagHT variable
-   TagDocEntryHT::iterator ItTagHT; 
-     
-   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
 //-----------------------------------------------------------------------------