* src/gdcmDocEntrySet.[h|cxx], gdcmDocument.[h|cxx] : amelioration of

[gdcm.git] / src / gdcmDocEntrySet.h

diff --git a/src/gdcmDocEntrySet.h b/src/gdcmDocEntrySet.h
index 6c3cae411de043a786dca11aa64270e8887da1a9..caa23e4b84ca670aa2e77d968f528f2030db2837 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/12/16 11:37:02 $
-  Version:   $Revision: 1.28 $
+  Date:      $Date: 2005/01/06 15:36:48 $
+  Version:   $Revision: 1.31 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -19,6 +19,7 @@
 #ifndef GDCMDOCENTRYSET_H
 #define GDCMDOCENTRYSET_H
 
+#include "gdcmBase.h"
 #include "gdcmException.h"
 #include <fstream>
 
@@ -54,18 +55,13 @@ 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 prints any type of entry to the entry set (pure vitual)
-   virtual void Print (std::ostream & os = std::cout) = 0;// pure virtual
-   /// Accessor to \ref PrintLevel
-   void SetPrintLevel(int level) { PrintLevel = level; }
-
    /// \brief adds any type of entry to the entry set (pure vitual)
    virtual bool AddEntry(DocEntry *Entry) = 0; // pure virtual
    virtual bool RemoveEntry(DocEntry *EntryToRemove)=0; // pure virtual
@@ -75,38 +71,32 @@ public:
    virtual void WriteContent (std::ofstream *fp, FileType filetype) = 0;// pure virtual
 
    virtual DocEntry* GetDocEntryByNumber(uint16_t group,
-                                         uint16_t element) = 0;
+                                         uint16_t elem) = 0;
    DocEntry* GetDocEntryByName(TagName const & name);
-   virtual std::string GetEntryByNumber(uint16_t group, uint16_t element) = 0;
+   virtual std::string GetEntryByNumber(uint16_t group, uint16_t elem) = 0;
    std::string GetEntryByName(TagName const & name);
-   DictEntry* NewVirtualDictEntry( uint16_t group, 
-                                   uint16_t element,
-                                   TagName const & vr     = "unkn",
-                                   TagName const & fourth = "unkn",
-                                   TagName const & name   = "unkn" );
+
+   DictEntry* NewVirtualDictEntry(uint16_t group, 
+                                  uint16_t element,
+                                  TagName const & vr     = GDCM_UNKNOWN,
+                                  TagName const & fourth = 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,
-                                 TagName const & vr); 
-   DocEntry* NewDocEntryByName  (TagName const & name);
-   SeqEntry* NewSeqEntryByNumber(uint16_t group, 
-                                 uint16_t element);
+   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);
+   DocEntry* NewDocEntryByNumber(uint16_t group,uint16_t elem,
+                                 TagName const & vr = GDCM_UNKNOWN); 
 
 // DictEntry  related utilities
    DictEntry *GetDictEntryByName  (TagName const & name);
-   DictEntry *GetDictEntryByNumber(uint16_t, uint16_t);
-
-   /// \brief Amount of printed details for each Header Entry (Dicom Element):
-   /// 0 : stands for the least detail level.
-   int PrintLevel;
+   DictEntry *GetDictEntryByNumber(uint16_t group, uint16_t elem);
+   DictEntry *GetDictEntryByNumber(uint16_t group, uint16_t elem,
+                                   TagName const & vr);
 };
 
 } // end namespace gdcm