X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntrySet.h;h=8d74d2cf5d9a1d5ac2624fcdf7f8c3bf56c8f585;hb=d5e16925a7d3c8dbd0e71b1989629ca0f619b119;hp=6c3cae411de043a786dca11aa64270e8887da1a9;hpb=ee91cee9d641284ed6a410f2af286bb681829055;p=gdcm.git

diff --git a/src/gdcmDocEntrySet.h b/src/gdcmDocEntrySet.h
index 6c3cae41..8d74d2cf 100644
--- 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/11 15:15:38 $
+  Version:   $Revision: 1.37 $
                                                                                 
   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>
 
@@ -34,6 +35,7 @@ typedef std::string BaseTagKey;
 //-----------------------------------------------------------------------------
 
 /**
+ * \brief
  * \ref DocEntrySet is an abstract base class for \ref ElementSet
  * and \ref SQItem which are both containers for DocEntries.
  * \ref ElementSet is based on the STL map<> container
@@ -54,18 +56,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
@@ -74,39 +71,29 @@ public:
    /// \brief write any type of entry to the entry set
    virtual void WriteContent (std::ofstream *fp, FileType filetype) = 0;// pure virtual
 
-   virtual DocEntry* GetDocEntryByNumber(uint16_t group,
-                                         uint16_t element) = 0;
-   DocEntry* GetDocEntryByName(TagName 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,
-                                   TagName const & vr     = "unkn",
-                                   TagName const & fourth = "unkn",
-                                   TagName const & name   = "unkn" );
+   virtual DocEntry *GetDocEntry(uint16_t group,
+                                 uint16_t elem) = 0;
+   virtual std::string GetEntry(uint16_t group, uint16_t elem) = 0;
+
+   DictEntry *NewVirtualDictEntry(uint16_t group, 
+                                  uint16_t element,
+                                  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,
-                                 TagName const & vr); 
-   DocEntry* NewDocEntryByName  (TagName const & name);
-   SeqEntry* NewSeqEntryByNumber(uint16_t group, 
-                                 uint16_t element);
 
-// DictEntry  related utilities
-   DictEntry *GetDictEntryByName  (TagName const & name);
-   DictEntry *GetDictEntryByNumber(uint16_t, uint16_t);
+   ValEntry *NewValEntry(uint16_t group,uint16_t elem,
+                         TagName const &vr = GDCM_UNKNOWN);
+   BinEntry *NewBinEntry(uint16_t group,uint16_t elem,
+                         TagName const &vr = GDCM_UNKNOWN);
+   SeqEntry *NewSeqEntry(uint16_t group,uint16_t elem);
 
-   /// \brief Amount of printed details for each Header Entry (Dicom Element):
-   /// 0 : stands for the least detail level.
-   int PrintLevel;
+// DictEntry  related utilities
+   DictEntry *GetDictEntry(uint16_t group, uint16_t elem);
+   DictEntry *GetDictEntry(uint16_t group, uint16_t elem,
+                           TagName const &vr);
 };
 
 } // end namespace gdcm