X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntry.h;h=33a8b2dfb86122cef59a1e6ae31a5d3089335bfb;hb=9f596ccd6001b165eca959c6a7b104eb10ff9911;hp=18decf0168eecaca473ba4ff2c6ff84e4be25a6b;hpb=5154dc89c0a2a565e9e79024ba8910f405279dd2;p=gdcm.git

diff --git a/src/gdcmDocEntry.h b/src/gdcmDocEntry.h
index 18decf01..33a8b2df 100644
--- 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();  };
 
@@ -37,15 +38,6 @@ public:
    /// Dictionnary, of the current Dicom Header Entry
    inline std::string  GetVR(void)        { return entry->GetVR();     };
 
-   /// \brief Returns the 'Value' (e.g. "Dupond Marcel") converted into a
-   /// 'string', if it's stored as an integer in the Dicom Header of the
-   /// current Dicom Header Entry
-   inline std::string  GetValue(void)     { return value;              };
-
-   /// \brief Returns the area value of the current Dicom Header Entry
-   ///  when it's not string-translatable (e.g : a LUT table)         
-   inline void *       GetVoidArea(void)  { return voidArea;           };
-
    /// \brief Returns offset (since the beginning of the file, including
    /// the File Pramble, if any) of the value of the current Dicom HeaderEntry
    /// \warning offset of the *value*, not of the Dicom Header Entry
@@ -78,12 +70,6 @@ public:
    /// \brief Sets only 'Usable Length' (*not* 'Read Length') of the current
    /// Dicom Header Entry
    inline void SetUsableLength(guint32 l) { UsableLength = l; }; 
-    
-   /// Sets the value (string) of the current Dicom Header Entry
-   inline void SetValue(std::string val) {  value = val; };
-
-   /// Sets the value (non string) of the current Dicom Header Entry
-   inline void SetVoidArea(void * area)  { voidArea = area;  };
    
    /// \brief   Sets the offset of the Dicom Element
    /// \warning use with caution !
@@ -97,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(); };
@@ -115,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;