Fix mistypings

[gdcm.git] / src / gdcmDocEntry.h

diff --git a/src/gdcmDocEntry.h b/src/gdcmDocEntry.h
index 235ff54a9563d0c9f94b50d0c0e166f28aca9c60..a756fa7d3d20bd4ca5488f63a35484819dc1b21c 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/05/06 16:05:16 $
-  Version:   $Revision: 1.63 $
+  Date:      $Date: 2007/09/17 12:16:02 $
+  Version:   $Revision: 1.71 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMDOCENTRY_H
-#define GDCMDOCENTRY_H
+#ifndef _GDCMDOCENTRY_H_
+#define _GDCMDOCENTRY_H_
 
 #include "gdcmRefCounter.h"
 #include "gdcmDictEntry.h"
@@ -25,7 +25,7 @@
 #include <iostream>
 #include <fstream>
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 class File;
 class SeqEntry;
@@ -41,22 +41,23 @@ class GDCM_EXPORT DocEntry : public RefCounter
 
 public:
    virtual void Print (std::ostream &os = std::cout, std::string const &indent = ""); 
-   virtual void WriteContent(std::ofstream *fp, FileType filetype);
+   virtual void WriteContent(std::ofstream *fp, FileType filetype, 
+                             bool insideMetaElements, bool insideSequence);
 
    /// \brief  Gets the DicEntry of the current Dicom entry
    /// @return The DicEntry of the current Dicom entry
    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
@@ -136,9 +137,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);
 
@@ -168,7 +178,7 @@ protected:
    /// \brief Value Representation (to avoid accessing Dicom Dict every time!)
    VRKey VR; // JPRx
       
-   /// \brief Dicom \ref TagKey. Contains Dicom Group number and Dicom Element number
+   /// \brief Dicom TagKey. Contains Dicom Group number and Dicom Element number
    ///        (to avoid accessing Dicom Dict every time !) // JPRx
    TagKey Key; // JPRx
 private: