X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntry.h;h=d48d9bef1cbfeb534e661d926d3695e3ce19868e;hb=e37def13c113c838f969f2dc37b5b7ce4c0c2483;hp=e3162589e57a68774a59f470a2d04284e93f97a8;hpb=59b7e8c61d23c966e15301514b498695f29577f7;p=gdcm.git

diff --git a/src/gdcmDocEntry.h b/src/gdcmDocEntry.h
index e3162589..d48d9bef 100644
--- a/src/gdcmDocEntry.h
+++ b/src/gdcmDocEntry.h
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntry.h,v $
   Language:  C++
-  Date:      $Date: 2004/09/03 20:27:44 $
-  Version:   $Revision: 1.19 $
+  Date:      $Date: 2004/10/13 14:15:29 $
+  Version:   $Revision: 1.26 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
                                                                                 
      This software is distributed WITHOUT ANY WARRANTY; without even
      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
@@ -19,44 +19,49 @@
 #ifndef GDCMDOCENTRY_H
 #define GDCMDOCENTRY_H
 
+#include "gdcmDictEntry.h"
 #include <iostream>
-#include <stdio.h>
 
-#include "gdcmDictEntry.h"
+class Header;
+class ValEntry;
+class BinEntry;
+class SeqEntry;
+
+namespace gdcm 
+{
 
-class gdcmHeader;
-class gdcmValEntry;
-class gdcmBinEntry;
-class gdcmSeqEntry;
 
 //-----------------------------------------------------------------------------
 /**
- * \ingroup gdcmDocEntry
  * \brief   The dicom header of a Dicom file contains a set of such entries
  *          (when successfuly parsed against a given Dicom dictionary)
  */
-class GDCM_EXPORT gdcmDocEntry
+class GDCM_EXPORT DocEntry
 {
 public:
-   gdcmDocEntry(gdcmDictEntry*);
+   DocEntry(DictEntry*);
+   virtual ~DocEntry() {};
 
    /// Returns the Dicom Group number of the current Dicom Header Entry
-   uint16_t      GetGroup()     { return DictEntry->GetGroup();  };
+   uint16_t      GetGroup()     { return DicomDict->GetGroup();  };
 
    /// Returns the Dicom Element number of the current Dicom Header Entry
-   uint16_t      GetElement()   { return DictEntry->GetElement();};
+   uint16_t      GetElement()   { return DicomDict->GetElement();};
+
+   /// Returns the 'key' of the current Dicom Header Entry
+   void  SetKey( TagKey key ) { Key = key; }
 
    /// Returns the 'key' of the current Dicom Header Entry
-   std::string  GetKey()       { return DictEntry->GetKey();    };
+   std::string GetKey() { return Key; }
 
    /// \brief Returns the 'Name' '(e.g. "Patient's Name") found in the Dicom
    /// Dictionnary of the current Dicom Header Entry
-   std::string  GetName()      { return DictEntry->GetName();   };
+   std::string  GetName()      { return DicomDict->GetName();   };
 
    /// \brief Returns the 'Value Representation' (e.g. "PN" : Person Name,
    /// "SL" : Signed Long), found in the Dicom Header or in the Dicom
    /// Dictionnary, of the current Dicom Header Entry
-   std::string  GetVR()        { return DictEntry->GetVR();     };
+   std::string  GetVR()        { return DicomDict->GetVR();     };
 
    /// \brief Returns offset (since the beginning of the file, including
    /// the File Preamble, if any) of the value of the current Dicom HeaderEntry
@@ -75,7 +80,7 @@ public:
    uint32_t GetReadLength() { return ReadLength; };
 
    /// Sets the 'Value Representation' of the current Dicom Header Entry
-   void SetVR(std::string const & v) { DictEntry->SetVR(v); };    
+   void SetVR(std::string const & v) { DicomDict->SetVR(v); };    
 
    /// \brief Sets both 'Read Length' and 'Usable Length' of the current
    /// Dicom Header Entry
@@ -105,15 +110,15 @@ public:
 
    /// \brief Tells us if the VR of the current Dicom Element is Unknown
    /// @return true if the VR is unknown
-   bool IsVRUnknown() { return DictEntry->IsVRUnknown(); };
+   bool IsVRUnknown() { return DicomDict->IsVRUnknown(); };
 
    /// \brief   Sets the DicEntry of the current Dicom Element
    /// @param   newEntry pointer to the DictEntry
-   void SetDictEntry(gdcmDictEntry *newEntry) { DictEntry = newEntry; };
+   void SetDictEntry(DictEntry *newEntry) { DicomDict = newEntry; };
 
    /// \brief  Gets the DicEntry of the current Dicom Element
    /// @return The DicEntry of the current Dicom Element
-   gdcmDictEntry * GetDictEntry() { return DictEntry; }; 
+   DictEntry * GetDictEntry() { return DicomDict; }; 
 
    /// \brief Sets the print level for the Dicom Header Elements
    /// \note 0 for Light Print; 1 for 'medium' Print, 2 for Heavy
@@ -127,29 +132,21 @@ public:
    
    uint32_t GetFullLength();
    
-   void Copy(gdcmDocEntry *doc);
+   void Copy(DocEntry *doc);
 
    bool IsItemDelimitor();
    bool IsSequenceDelimitor();   
 
-   /// \brief Gets the depth level of a Dicom header entry embedded in
-   ///        a SeQuence
-   int GetDepthLevel() { return SQDepthLevel; }
-
-   /// \brief Sets the depth level of a Dicom header entry embedded in
-   ///        a SeQuence
-   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 DocEntry * Header::ReadNextElement(void);
+   friend class Header;    
 
 protected:
 // Variables
 
    /// \brief pointer to the underlying Dicom dictionary element
-   gdcmDictEntry *DictEntry;
+   DictEntry *DicomDict;
    
    /// \brief Updated from ReadLength, by FixFoungLentgh() for fixing a bug
    /// in the header or helping the parser going on    
@@ -170,10 +167,11 @@ protected:
 
    /// How many details are to be printed (value : 0,1,2)      
    int PrintLevel;
-   
-   /// Gives the depth level of elements inside SeQuences   
-   int SQDepthLevel;
-};
 
+   /// \brief Generalized key (i.e. a BaseTagKey prepending a TagKey)
+   ///        of this DocEntry
+   TagKey Key;
+};
+} // end namespace gdcm
 //-----------------------------------------------------------------------------
 #endif