ENH: Adding 'gdcm' namespace. Be nice with me this was a ~13000 lines patch. Also...

[gdcm.git] / src / gdcmElementSet.h

diff --git a/src/gdcmElementSet.h b/src/gdcmElementSet.h
index 826b85cf32d27375d488bc41aacf9ec81fb2e292..4bf25ae86b7d91c97741c16a27b61d0676c1b1b1 100644 (file)
--- a/src/gdcmElementSet.h
+++ b/src/gdcmElementSet.h
@@ -1,36 +1,71 @@
-// gdcmElementSet.h
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmElementSet.h,v $
+  Language:  C++
+  Date:      $Date: 2004/10/12 04:35:46 $
+  Version:   $Revision: 1.19 $
+                                                                                
+  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.html for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
 
 #ifndef GDCMELEMENTSET_H
 #define GDCMELEMENTSET_H
 
-#include <map>
-#include <iostream>
 #include "gdcmCommon.h"
 #include "gdcmDocEntrySet.h"
+#include <map>
+#include <iostream>
+
+class ValEntry;
+class BinEntry;
+class SeqEntry;
+namespace gdcm 
+{
 
-typedef std::map<TagKey, gdcmDocEntry *> TagDocEntryHT;
+
+typedef std::map<TagKey, DocEntry *> TagDocEntryHT;
 
 //-----------------------------------------------------------------------------
 
-class GDCM_EXPORT gdcmElementSet : public gdcmDocEntrySet
+class GDCM_EXPORT ElementSet : public DocEntrySet
 {
 public:
-   gdcmElementSet(int);
-   ~gdcmElementSet(void);
-   virtual bool AddEntry(gdcmDocEntry *Entry);
-   virtual bool RemoveEntry(gdcmDocEntry *EntryToRemove);
-
+   ElementSet(int);
+   ~ElementSet();
+   virtual bool AddEntry(DocEntry *Entry);
+   bool RemoveEntry(DocEntry *EntryToRemove);
+   bool RemoveEntryNoDestroy(DocEntry *EntryToRemove);
+   
    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; };
+
+
 protected:
 // Variables
    /// Hash Table (map), to provide fast access
-   TagDocEntryHT tagHT; 
+   TagDocEntryHT TagHT; 
      
 private:
-   
-};
+   /// Just for following ::GetTagHT()
+   friend class Document;
 
+   /// Accessor to \ref TagHT
+   TagDocEntryHT* GetTagHT() { return &TagHT; };
+};
+} // end namespace gdcm
 //-----------------------------------------------------------------------------
 #endif