Forgot to update this one

[gdcm.git] / src / gdcmDocEntry.h

diff --git a/src/gdcmDocEntry.h b/src/gdcmDocEntry.h
index b41337035391d7933307273fd0b5cf29d47f1e18..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/03/22 13:19:25 $
-  Version:   $Revision: 1.61 $
+  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,27 +41,28 @@ 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.GetGroup();  }
+   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.GetElement();}   
+   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
    /// Dictionnary of the current Dicom Header Entry
-   std::string const &GetName() const { return DicomDict->GetName(); }
+   std::string const &GetName();
 
    /// \brief Returns the 'Value Representation' (e.g. "PN" : Person Name,
    /// "SL" : Signed Long), found in the Dicom header or in the Dicom
@@ -72,11 +73,12 @@ public:
    /// \brief Returns the 'Value Multiplicity' (e.g. "1", "6", "1-n", "3-n"),
    /// 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();
 
    /// 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); } 
+   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
    /// \warning offset of the *value*, not of the Dicom entry
@@ -128,20 +130,31 @@ public:
 
    /// \brief Tells us if the VR of the current Dicom entry is Unknown
    /// @return true if the VR is unknown
-   bool IsVRUnknown() const { return DicomDict->IsVRUnknown(); }
+//   bool IsVRUnknown() const { return DicomDict->IsVRUnknown(); }
+     bool IsVRUnknown() const { return VR == GDCM_VRUNKNOWN; }
 
    /// \brief Tells us if the VM of the current Dicom entry is Unknown
    /// @return true if the VM is unknown
-   bool IsVMUnknown() const { return DicomDict->IsVMUnknown(); }
-
-   bool IsItemDelimitor();
-   bool IsItemStarter();
-   bool IsSequenceDelimitor();   
+//   bool IsVMUnknown() const { return DicomDict->IsVMUnknown(); }
+   bool IsVMUnknown() { return GetVM() == GDCM_UNKNOWN; }
+
+/// \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);
 
 protected:
-   DocEntry(DictEntry*);
+  // DocEntry(DictEntry*);
+   DocEntry(uint16_t group, uint16_t elem, VRKey const &vr);
    virtual ~DocEntry();
 
    /// \brief pointer to the underlying Dicom dictionary element
@@ -165,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: