ENH: Minor patch, mostly cosmetic clean up

[gdcm.git] / src / gdcmElementSet.h

diff --git a/src/gdcmElementSet.h b/src/gdcmElementSet.h
index f4003e57151a549f269d410d3ea61be5288ddb1d..0c1fd35774292797721591d22f5b86af39f60e85 100644 (file)
--- a/src/gdcmElementSet.h
+++ b/src/gdcmElementSet.h
@@ -1,41 +1,60 @@
-// gdcmElementSet.h
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmElementSet.h,v $
+  Language:  C++
+  Date:      $Date: 2004/07/19 03:34:12 $
+  Version:   $Revision: 1.11 $
+                                                                                
+  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.
+                                                                                
+     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 "gdcmDocEntry.h"
 
-#include <map>
-typedef std::string TagKey;
-typedef std::map<TagKey, gdcmDocEntry *> TagDocEntryHT;
+class gdcmValEntry;
+class gdcmBinEntry;
+class gdcmSeqEntry;
+
 
+typedef std::map<gdcmTagKey, gdcmDocEntry *> TagDocEntryHT;
 
 //-----------------------------------------------------------------------------
 
-class GDCM_EXPORT gdcmElementSet : public gdcmDocEntrySet 
+class GDCM_EXPORT gdcmElementSet : public gdcmDocEntrySet
 {
 public:
-   gdcmElementSet(void);
-   ~gdcmElementSet(void);
-   virtual bool AddEntry(gdcmDocEntry *Entry); // add to the H Table
-
-  
-protected:
+   gdcmElementSet(int);
+   ~gdcmElementSet();
+   virtual bool AddEntry(gdcmDocEntry *Entry);
+   virtual bool RemoveEntry(gdcmDocEntry *EntryToRemove);
 
-private:
-
-   // DocEntry related utilities    
-   virtual gdcmDocEntry *NewDocEntryByNumber(guint16 group,
-                                             guint16 element);
-   virtual gdcmDocEntry *NewDocEntryByName  (std::string Name);  
+   virtual void Print(std::ostream &os = std::cout); 
+   virtual void Write(FILE *fp, FileType filetype); 
 
+   /// Accessor to \ref gdcmElementSet::tagHT
+   // Do not expose this to user (public API) !
+   //TagDocEntryHT &GetEntry() { return TagHT; };
 
+protected:
 // Variables
-
    /// Hash Table (map), to provide fast access
-   TagDocEntryHT tagHT;   
-   
+   TagDocEntryHT TagHT; 
+     
+private:
+   //friend class gdcmDicomDir;
 };
 
 //-----------------------------------------------------------------------------