- now, DicomDir stuff stakes into account the 'new' structure

[gdcm.git] / src / gdcmDocEntrySet.h

diff --git a/src/gdcmDocEntrySet.h b/src/gdcmDocEntrySet.h
index 695eb39e4d76fbf2ea0238ff4f8a561f4f1318e5..26fd1269a2f10101cb739999c41df4ff795aa95d 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/06/22 13:47:33 $
-  Version:   $Revision: 1.12 $
+  Date:      $Date: 2004/08/26 15:29:52 $
+  Version:   $Revision: 1.15 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -26,7 +26,6 @@
 
 class GDCM_EXPORT gdcmDocEntrySet
 {
-
 public:
 
    gdcmDocEntrySet(int depth = 0); 
@@ -34,53 +33,52 @@ public:
 
    /// \brief adds any type of entry to the entry set (pure vitual)
    virtual bool AddEntry(gdcmDocEntry *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
 
    /// \brief write any type of entry to the entry set
-   virtual void Write (FILE *fp, FileType filetype)=0;// pure virtual
+   virtual void Write (FILE *fp, FileType filetype) = 0;// pure virtual
 
    /// \brief Gets the depth level of a Dicom Header Entry embedded in a
    ///        SeQuence
-   inline int GetDepthLevel(void) { return SQDepthLevel; }
+   int GetDepthLevel() { return SQDepthLevel; }
 
    /// \brief Sets the depth level of a Dicom Header Entry embedded in a
    /// SeQuence
-   inline void SetDepthLevel(int depth) { SQDepthLevel = depth; }
+   void SetDepthLevel(int depth) { SQDepthLevel = depth; }
 
-       virtual gdcmDocEntry *GetDocEntryByNumber(guint16 group,guint16 element) = 0;
-   gdcmDocEntry *GetDocEntryByName(std::string name);
-   virtual std::string GetEntryByNumber(guint16 group,guint16 element) = 0;
-   std::string GetEntryByName(TagName name);                    
-   gdcmDictEntry *NewVirtualDictEntry(guint16 group, 
-                                      guint16 element,
-                                      std::string vr     = "unkn",
-                                      std::string fourth = "unkn",
-                                      std::string name   = "unkn");
-                                                                                                         
- protected:
-
-  // DocEntry  related utilities 
+   virtual gdcmDocEntry* GetDocEntryByNumber(uint16_t group,
+                                             uint16_t element) = 0;
+   gdcmDocEntry *GetDocEntryByName(std::string const & name);
+   virtual std::string GetEntryByNumber(uint16_t group,uint16_t element) = 0;
+   std::string GetEntryByName(TagName const & name);
+   gdcmDictEntry *NewVirtualDictEntry(uint16_t group, 
+                                      uint16_t element,
+                                      std::string const & vr     = "unkn",
+                                      std::string const & fourth = "unkn",
+                                      std::string const & name   = "unkn");
   
-       gdcmValEntry *NewValEntryByNumber(guint16 group, 
-                                     guint16 element);                                                                                                  
-   gdcmBinEntry *NewBinEntryByNumber(guint16 group, 
-                                     guint16 element);         
-   gdcmDocEntry *NewDocEntryByNumber(guint16 group, 
-                                     guint16 element); 
-   gdcmDocEntry *NewDocEntryByName  (std::string Name);
-       
-  // DictEntry  related utilities
-   
-   gdcmDictEntry *GetDictEntryByName  (std::string Name);
-   gdcmDictEntry *GetDictEntryByNumber(guint16, guint16);
-                       
+protected:
+
+// DocEntry  related utilities 
+   gdcmValEntry* NewValEntryByNumber(uint16_t group, 
+                                     uint16_t element);
+   gdcmBinEntry* NewBinEntryByNumber(uint16_t group, 
+                                     uint16_t element);
+   gdcmDocEntry* NewDocEntryByNumber(uint16_t group, 
+                                     uint16_t element); 
+   gdcmDocEntry* NewDocEntryByName  (std::string const & name);
+   gdcmSeqEntry* NewSeqEntryByNumber(uint16_t group, 
+                                     uint16_t element);
+
+// DictEntry  related utilities
+   gdcmDictEntry *GetDictEntryByName  (std::string const & name);
+   gdcmDictEntry *GetDictEntryByNumber(uint16_t, uint16_t);
+
    /// Gives the depth level of the element set inside SeQuences   
    int SQDepthLevel;
-
 private:
-    
 };