X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntry.h;h=5a95fe0a6e3014b9e20d0ecf9428d35262e39502;hb=51cbcb8520d5fcb26ea0ceec99f58b8db9692876;hp=7373c7287ece0122cf4c673995af4ce2aa3dbe36;hpb=bba6b52311989034cfaca84d1ab1e492d94c1873;p=gdcm.git

diff --git a/src/gdcmDocEntry.h b/src/gdcmDocEntry.h
index 7373c728..5a95fe0a 100644
--- a/src/gdcmDocEntry.h
+++ b/src/gdcmDocEntry.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntry.h,v $
   Language:  C++
-  Date:      $Date: 2004/11/30 16:24:31 $
-  Version:   $Revision: 1.31 $
+  Date:      $Date: 2005/01/07 16:14:58 $
+  Version:   $Revision: 1.36 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -19,23 +19,25 @@
 #ifndef GDCMDOCENTRY_H
 #define GDCMDOCENTRY_H
 
+#include "gdcmBase.h"
 #include "gdcmDictEntry.h"
+
 #include <iostream>
 #include <fstream>
 
+namespace gdcm 
+{
 class Header;
 class ValEntry;
 class BinEntry;
 class SeqEntry;
 
-namespace gdcm 
-{
 //-----------------------------------------------------------------------------
 /**
  * \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 DocEntry
+class GDCM_EXPORT DocEntry : public Base
 {
 public:
    DocEntry(DictEntry*);
@@ -48,19 +50,30 @@ public:
    uint16_t      GetElement()   { return DicomDict->GetElement();};
 
    /// Returns the 'key' of the current Dicom Header Entry
-   void  SetKey( TagKey const & key ) { Key = key; }
+   void  SetKey( TagKey const &key ) { Key = key; }
 
    /// Returns the 'key' of the current Dicom Header Entry
-   std::string const & GetKey() const { return Key; }
+   std::string const &GetKey() const { return Key; }
 
    /// \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 Header Entry
-   std::string const & GetVR() const { return DicomDict->GetVR(); };
+   std::string const &GetVR() const { return DicomDict->GetVR(); };
+
+   /// \brief Returns the 'Value Multiplicity' (e.g. "1", "1-n", "6"),
+   /// found in the Dicom Header or in the Dicom Dictionnary
+   /// of the current Dicom Header Entry
+   std::string const &GetVM() const { return DicomDict->GetVM(); };
+
+   /// Sets the 'Value Representation' of the current Dicom Header Entry
+   void SetVR( TagName const &v) { DicomDict->SetVR(v); };
+
+   /// Sets the 'Value Multiplicity' of the current Dicom Header Entry
+   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 HeaderEntry
@@ -78,9 +91,6 @@ public:
    ///          the usable length is set to zero)
    uint32_t GetReadLength() { return ReadLength; };
 
-   /// Sets the 'Value Representation' of the current Dicom Header Entry
-   void SetVR( TagName const & v) { DicomDict->SetVR(v); };    
-
    /// \brief Sets both 'Read Length' and 'Usable Length' of the current
    /// Dicom Header Entry
    void SetLength(uint32_t l) { ReadLength = UsableLength = l; };
@@ -111,6 +121,10 @@ public:
    /// @return true if the VR is unknown
    bool IsVRUnknown() { return DicomDict->IsVRUnknown(); };
 
+   /// \brief Tells us if the VM of the current Dicom Element is Unknown
+   /// @return true if the VM is unknown
+   bool IsVMUnknown() { return DicomDict->IsVMUnknown(); };
+
    /// \brief   Sets the DicEntry of the current Dicom Element
    /// @param   newEntry pointer to the DictEntry
    void SetDictEntry(DictEntry *newEntry) { DicomDict = newEntry; };
@@ -118,15 +132,7 @@ public:
    /// \brief  Gets the DicEntry of the current Dicom Element
    /// @return The DicEntry of the current Dicom Element
    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
-   void SetPrintLevel(int level) { PrintLevel = level; };
-
-   /// \brief Gets the print level for the Dicom Header Elements
-   int GetPrintLevel() { return PrintLevel; };
    
-   virtual void Print (std::ostream & os = std::cout); 
    virtual void WriteContent(std::ofstream *fp, FileType filetype);
    
    uint32_t GetFullLength();
@@ -136,6 +142,8 @@ public:
    bool IsItemDelimitor();
    bool IsSequenceDelimitor();   
 
+   virtual void Print (std::ostream &os = std::cout); 
+
 private:
    // FIXME: In fact we should be more specific and use :
    // friend DocEntry * Header::ReadNextElement(void);
@@ -164,9 +172,6 @@ protected:
    /// Offset from the begining of file for direct user access
    size_t Offset; 
 
-   /// How many details are to be printed (value : 0,1,2)      
-   int PrintLevel;
-
    /// \brief Generalized key of this DocEntry (for details on
    ///        the generalized key refer to \ref TagKey documentation).
    TagKey Key;