X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntry.h;h=2310a70bd3f36eeb7f07341ac264a2cf8f92b3bd;hb=3ccb0db5e229de47c8a1fdc09deb3561315ec282;hp=724c9b83465b4adb3531656df504ae3dd631be11;hpb=bd4a12d577158f01744a793b456ae022810d4a5c;p=gdcm.git

diff --git a/src/gdcmDocEntry.h b/src/gdcmDocEntry.h
index 724c9b83..2310a70b 100644
--- a/src/gdcmDocEntry.h
+++ b/src/gdcmDocEntry.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntry.h,v $
   Language:  C++
-  Date:      $Date: 2005/07/11 14:40:40 $
-  Version:   $Revision: 1.47 $
+  Date:      $Date: 2005/10/18 12:58:28 $
+  Version:   $Revision: 1.51 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -28,8 +28,6 @@
 namespace gdcm 
 {
 class File;
-class ValEntry;
-class BinEntry;
 class SeqEntry;
 
 //-----------------------------------------------------------------------------
@@ -42,20 +40,20 @@ class GDCM_EXPORT DocEntry : public Base
 public:
    DocEntry(DictEntry*);
    /// \brief Canonical Destructor
-   virtual ~DocEntry() {};
+   virtual ~DocEntry() {}
 
    virtual void Print (std::ostream &os = std::cout, std::string const &indent = ""); 
    virtual void WriteContent(std::ofstream *fp, FileType filetype);
 
    /// \brief  Gets the DicEntry of the current Dicom entry
    /// @return The DicEntry of the current Dicom entry
-   DictEntry * GetDictEntry() { return DicomDict; }; 
+   DictEntry * GetDictEntry() { return DicomDict; } 
 
    /// Returns the Dicom Group number of the current Dicom entry
-   uint16_t      GetGroup()     { return DicomDict->GetGroup();  };
+   const uint16_t &GetGroup() const   { return DicomDict->GetGroup();  }
 
    /// Returns the Dicom Element number of the current Dicom entry
-   uint16_t      GetElement()   { return DicomDict->GetElement();};
+   const uint16_t &GetElement() const { return DicomDict->GetElement();}
 
    /// Set the 'key' of the current Dicom entry
    void  SetKey( TagKey const &key ) { Key = key; }
@@ -65,42 +63,42 @@ public:
 
    /// \brief Returns the 'Name' '(e.g. "Patient's Name") found in the Dicom
    /// Dictionnary of the current Dicom Header Entry
-   std::string const &GetName() const { return DicomDict->GetName(); };
+   std::string const &GetName() const { 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 entry
-   std::string const &GetVR() const { return DicomDict->GetVR(); };
+   VRKey const &GetVR() const { return DicomDict->GetVR(); }
 
    /// \brief Returns the 'Value Multiplicity' (e.g. "1", "1-n", "6"),
    /// found in the Dicom entry or in the Dicom Dictionnary
    /// of the current Dicom entry
-   std::string const &GetVM() const { return DicomDict->GetVM(); };
+   std::string const &GetVM() const { return DicomDict->GetVM(); }
 
    /// Sets the 'Value Multiplicity' of the current Dicom entry
-   void SetVM( TagName const &v) { DicomDict->SetVM(v); }; 
+   void SetVM( TagName const &v) { DicomDict->SetVM(v); } 
 
    /// \brief Returns offset (since the beginning of the file, including
    /// the File Preamble, if any) of the value of the current Dicom entry
    /// \warning offset of the *value*, not of the Dicom entry
-   size_t GetOffset() { return Offset; };
+   const size_t &GetOffset() const { return Offset; }
 
    /// \brief Sets only 'Read Length' (*not* 'Usable Length') of the current
    /// Dicom entry
-   void SetReadLength(uint32_t l) { ReadLength = l; };
+   void SetReadLength(uint32_t l) { ReadLength = l; }
    /// \brief Returns the 'read length' of the current Dicom entry
    /// \warning this value is the one stored in the Dicom header but not
    ///          mandatoryly the one thats's used (in case on SQ, or delimiters,
    ///          the usable length is set to zero)
-   uint32_t GetReadLength() { return ReadLength; };
+   const uint32_t &GetReadLength() const { return ReadLength; }
 
    /// \brief Sets both 'Read Length' and 'Usable Length' of the current
    /// Dicom entry
-   void SetLength(uint32_t l) { Length = l; };
+   virtual void SetLength(uint32_t l) { Length = l; }
    /// \brief Returns the actual value length of the current Dicom entry
    /// \warning this value is not *always* the one stored in the Dicom header
    ///          in case of well knowned bugs
-   uint32_t GetLength() { return Length; };
+   const uint32_t &GetLength() const { return Length; }
 
    uint32_t GetFullLength();
 
@@ -108,24 +106,25 @@ public:
    /// \brief   Sets the offset of the Dicom entry
    /// \warning use with caution !
    /// @param   of offset to be set
-   void SetOffset(size_t of) { Offset = of; };
+   void SetOffset(size_t of) { Offset = of; }
 
    /// Sets to TRUE the ImplicitVr flag of the current Dicom entry
-   void SetImplicitVR() { ImplicitVR = true; };
+   void SetImplicitVR() { ImplicitVR = true; }
  
    /// \brief Tells us if the current Dicom entry was checked as ImplicitVr
    /// @return true if the current Dicom entry was checked as ImplicitVr
-   bool IsImplicitVR() { return ImplicitVR; };
+   bool IsImplicitVR() const { return ImplicitVR; }
 
    /// \brief Tells us if the VR of the current Dicom entry is Unknown
    /// @return true if the VR is unknown
-   bool IsVRUnknown() { return DicomDict->IsVRUnknown(); };
+   bool IsVRUnknown() const { return DicomDict->IsVRUnknown(); }
 
    /// \brief Tells us if the VM of the current Dicom entry is Unknown
    /// @return true if the VM is unknown
-   bool IsVMUnknown() { return DicomDict->IsVMUnknown(); };
+   bool IsVMUnknown() const { return DicomDict->IsVMUnknown(); }
 
    bool IsItemDelimitor();
+   bool IsItemStarter();
    bool IsSequenceDelimitor();   
    
    virtual void Copy(DocEntry *e);