Add class DicomDirPrivate, for dealing with SERIE/PRIVATE

[gdcm.git] / src / gdcmDocEntry.h

diff --git a/src/gdcmDocEntry.h b/src/gdcmDocEntry.h
index 950cc1d8d11b00fdc1d9fa5c0bb3744ca391d69b..2534f3fabc6270f5f4bee35c8c0558f6812c68c4 100644 (file)
--- a/src/gdcmDocEntry.h
+++ b/src/gdcmDocEntry.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntry.h,v $
   Language:  C++
-  Date:      $Date: 2006/04/11 16:03:26 $
-  Version:   $Revision: 1.62 $
+  Date:      $Date: 2006/07/06 16:57:06 $
+  Version:   $Revision: 1.66 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -48,15 +48,15 @@ public:
    DictEntry * GetDictEntry() { return DicomDict; } 
 
    /// Returns the Dicom Group number of the current Dicom entry
-   const uint16_t GetGroup() const   { return Key[0];  }
+   uint16_t const &GetGroup() const   { return Key[0];  }
    //const uint16_t &GetGroup() const   { return DicomDict->GetGroup();  }
 
    /// Returns the Dicom Element number of the current Dicom entry
-   const uint16_t GetElement() const { return Key[1];}   
+   uint16_t const &GetElement() const { return Key[1];}   
    //const uint16_t &GetElement() const { return DicomDict->GetElement();}
 
    /// Returns the 'key' of the current Dicom entry
-   TagKey GetKey() const { return Key; }   
+   TagKey const &GetKey() const { return Key; }   
    //TagKey GetKey() const { return DicomDict->GetKey(); }
 
    /// \brief Returns the 'Name' '(e.g. "Patient's Name") found in the Dicom
@@ -76,7 +76,7 @@ public:
 
    /// Sets the 'Value Multiplicity' of the current Dicom entry
    //void SetVM( TagName const &v) { DicomDict->SetVM(v); } 
-   void SetVM( TagName &v) { std::cout << "-----------------FIXME : SetVM "; }
+   void SetVM( TagName &) { std::cout << "-----------------FIXME : SetVM "; }
     
    /// \brief Returns offset (since the beginning of the file, including
    /// the File Preamble, if any) of the value of the current Dicom entry
@@ -136,9 +136,18 @@ public:
    /// @return true if the VM is unknown
 //   bool IsVMUnknown() const { return DicomDict->IsVMUnknown(); }
    bool IsVMUnknown() { return GetVM() == GDCM_UNKNOWN; }
-   bool IsItemDelimitor();
-   bool IsItemStarter();
-   bool IsSequenceDelimitor();   
+
+/// \brief   tells us if entry is the last one of a 'no length' SequenceItem 
+///        (fffe,e00d) 
+   bool IsItemDelimitor() 
+                      {return (GetGroup() == 0xfffe && GetElement() == 0xe00d);}
+///\brief   tells us if entry is the last one of a 'no length' Sequence 
+///         (fffe,e0dd)       
+   bool IsItemStarter(){ if (GetGroup() != 0xfffe) return false;
+                         return (GetElement() == 0xe000); }
+ /// \brief   tells us if entry is the last one of a 'no length' Sequence 
+ ///          (fffe,e0dd) 
+   bool IsSequenceDelimitor() { return (GetGroup() == 0xfffe && GetElement() == 0xe0dd);}  
 
    virtual void Copy(DocEntry *doc);