* src/gdcmValEntry.h: member voidArea type changed from char* to void*.

[gdcm.git] / src / gdcmDocEntry.h

diff --git a/src/gdcmDocEntry.h b/src/gdcmDocEntry.h
index 5f1094baf2cfdbd1d6f2597194ec6bc28d452e7b..33a8b2dfb86122cef59a1e6ae31a5d3089335bfb 100644 (file)
--- a/src/gdcmDocEntry.h
+++ b/src/gdcmDocEntry.h
@@ -7,6 +7,7 @@
 #include <stdio.h>
 
 #include "gdcmDictEntry.h"
+//#include "gdcmValEntry.h"
 class gdcmHeader;
 
 //-----------------------------------------------------------------------------
@@ -18,7 +19,7 @@ class gdcmHeader;
 class GDCM_EXPORT gdcmDocEntry {
 public:
    gdcmDocEntry(gdcmDictEntry*);
-
+     
    /// Returns the Dicom Group number of the current Dicom Header Entry
    inline guint16      GetGroup(void)     { return entry->GetGroup();  };
 
@@ -82,7 +83,7 @@ public:
    /// @return true if the current Dicom Element was checked as ImplicitVr
    inline bool gdcmDocEntry::IsImplicitVR(void) { return ImplicitVR; };
 
-   /// \brief Tells us if the VR of the current Dicom Element is Unkonwn
+   /// \brief Tells us if the VR of the current Dicom Element is Unknown
    /// @return true if the VR is unkonwn
    inline bool gdcmDocEntry::IsVRUnknown(void)
                { return entry->IsVRUnknown(); };
@@ -100,26 +101,39 @@ public:
    /// \note 0 for Light Print; 1 for 'medium' Print, 2 for Heavy
    void SetPrintLevel(int level) { printLevel = level; };
 
-   void Print (std::ostream & os = std::cout); 
-    
-   /// Gets the depth level of a Dicom Header Entry embedded in a SeQuence
-   inline int GetSQDepthLevel(void) { return (SQDepthLevel); };
+   /// \brief Gets the print level for the Dicom Header Elements
+   int GetPrintLevel(void) { return(printLevel); };
+   
+   virtual void Print (std::ostream & os = std::cout); 
+   
+   void gdcmDocEntry::PrintCommonPart(std::ostream & os);
          
    guint32 GetFullLength(void);
    
    void Copy(gdcmDocEntry *doc);
-     
+
+   bool isItemDelimitor();
+   bool isSequenceDelimitor();   
+
+   /// \brief Gets the depth level of a Dicom header entry embedded in
+   ///        a SeQuence
+   inline int GetDepthLevel(void) {return(SQDepthLevel);}
+               
+   /// \brief Sets the depth level of a Dicom header entry embedded in
+   ///        a SeQuence
+   inline void SetDepthLevel(int depth) {SQDepthLevel = depth;}
+            
 private:
    // FIXME: In fact we should be more specific and use :
    // friend gdcmDocEntry * gdcmHeader::ReadNextElement(void);
-   friend class gdcmHeader;
+   friend class gdcmHeader;    
 
-   /// Sets the depth level of a Dicom Header Entry embedded in a SeQuence 
-   inline void SetSQDepthLevel(int depthLevel) { SQDepthLevel = depthLevel; };
-      
+protected:
 // Variables
-   gdcmDictEntry *entry;
 
+   /// \brief pointer to the underlying Dicom dictionary element
+   gdcmDictEntry *entry;
+   
    /// \brief Updated from ReadLength, by FixFoungLentgh() for fixing a bug
    /// in the header or helping the parser going on    
    guint32 UsableLength;