ENH: properly handle compiler that does not have __FUNCTION__

[gdcm.git] / src / gdcmDocEntrySet.h

diff --git a/src/gdcmDocEntrySet.h b/src/gdcmDocEntrySet.h
index 088aa255f45912e645d5014b6aaedc7762809d67..108eec2e438299a85e0481afe32ba5cfc48c4e38 100644 (file)
--- a/src/gdcmDocEntrySet.h
+++ b/src/gdcmDocEntrySet.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntrySet.h,v $
   Language:  C++
-  Date:      $Date: 2004/10/12 04:35:45 $
-  Version:   $Revision: 1.20 $
+  Date:      $Date: 2005/01/07 12:29:17 $
+  Version:   $Revision: 1.35 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -19,7 +19,9 @@
 #ifndef GDCMDOCENTRYSET_H
 #define GDCMDOCENTRYSET_H
 
+#include "gdcmBase.h"
 #include "gdcmException.h"
+#include <fstream>
 
 namespace gdcm 
 {
@@ -37,7 +39,7 @@ typedef std::string BaseTagKey;
  * and \ref SQItem which are both containers for DocEntries.
  * \ref ElementSet is based on the STL map<> container
  * (see \ref ElementSet::TagHT), as opposed to \ref SQItem
- * which is based on an STL list container (see \ref SQItem::docEntries).
+ * which is based on an STL list container (see \ref ListDocEntry).
  * Since the syntax for adding a new element to a map<> or a list<>
  * differ, \ref DocEntrySet is designed as an adapter to unify the
  * interfaces of \ref DocEntrySet and \ref ElementSet.
@@ -53,52 +55,44 @@ typedef std::string BaseTagKey;
  *       members to this class since this class is designed as an adapter 
  *       in the form of an abstract base class.
  */
-class GDCM_EXPORT DocEntrySet
+class GDCM_EXPORT DocEntrySet : public Base
 {
+friend class File;
 public:
    DocEntrySet() {};
    virtual ~DocEntrySet() {};
 
    /// \brief adds any type of entry to the entry set (pure vitual)
    virtual bool AddEntry(DocEntry *Entry) = 0; // pure virtual
- 
-   /// \brief prints any type of entry to the entry set (pure vitual)
-   virtual void Print (std::ostream & os = std::cout) = 0;// pure virtual
+   virtual bool RemoveEntry(DocEntry *EntryToRemove)=0; // pure virtual
+   virtual bool RemoveEntryNoDestroy(DocEntry *EntryToRemove)=0; // pure virtual
 
    /// \brief write any type of entry to the entry set
-   virtual void Write (FILE *fp, FileType filetype) = 0;// pure virtual
+   virtual void WriteContent (std::ofstream *fp, FileType filetype) = 0;// pure virtual
+
+   virtual DocEntry *GetDocEntryByNumber(uint16_t group,
+                                         uint16_t elem) = 0;
+   virtual std::string GetEntryByNumber(uint16_t group, uint16_t elem) = 0;
 
-   virtual DocEntry* GetDocEntryByNumber(uint16_t group,
-                                             uint16_t element) = 0;
-   DocEntry *GetDocEntryByName(std::string const & name);
-   virtual std::string GetEntryByNumber(uint16_t group,uint16_t element) = 0;
-   std::string GetEntryByName(TagName const & name);
    DictEntry *NewVirtualDictEntry(uint16_t group, 
                                   uint16_t element,
-                                  std::string const & vr     = "unkn",
-                                  std::string const & fourth = "unkn",
-                                  std::string const & name   = "unkn");
+                                  TagName const &vr     = GDCM_UNKNOWN,
+                                  TagName const &vm     = GDCM_UNKNOWN,
+                                  TagName const &name   = GDCM_UNKNOWN );
   
 protected:
-
 // DocEntry  related utilities 
-   ValEntry* NewValEntryByNumber(uint16_t group, 
-                                 uint16_t element);
-   BinEntry* NewBinEntryByNumber(uint16_t group, 
-                                 uint16_t element);
-   DocEntry* NewDocEntryByNumber(uint16_t group, 
-                                 uint16_t element); 
-   DocEntry* NewDocEntryByNumber(uint16_t group, 
-                                 uint16_t element,
-                                 std::string const & VR); 
-   DocEntry* NewDocEntryByName  (std::string const & name);
-   SeqEntry* NewSeqEntryByNumber(uint16_t group, 
-                                 uint16_t element);
 
-// DictEntry  related utilities
-   DictEntry *GetDictEntryByName  (std::string const & name);
-   DictEntry *GetDictEntryByNumber(uint16_t, uint16_t);
+   ValEntry *NewValEntryByNumber(uint16_t group,uint16_t elem,
+                                 TagName const &vr = GDCM_UNKNOWN);
+   BinEntry *NewBinEntryByNumber(uint16_t group,uint16_t elem,
+                                 TagName const &vr = GDCM_UNKNOWN);
+   SeqEntry *NewSeqEntryByNumber(uint16_t group,uint16_t elem);
 
+// DictEntry  related utilities
+   DictEntry *GetDictEntryByNumber(uint16_t group, uint16_t elem);
+   DictEntry *GetDictEntryByNumber(uint16_t group, uint16_t elem,
+                                   TagName const &vr);
 };
 
 } // end namespace gdcm