X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntry.h;h=b779a89a5e54fb34d5e3ac723491a95a28665515;hb=b08873f37c7696af28217a92f2ee41bf76e98a63;hp=cf12bdfadf5a6396e062931f832e34f5df7d68fb;hpb=9aa702d6397e3e490263a0791dd6c8ed2f3d1e83;p=gdcm.git diff --git a/src/gdcmDocEntry.h b/src/gdcmDocEntry.h index cf12bdfa..b779a89a 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/10/19 13:17:04 $ - Version: $Revision: 1.52 $ + Date: $Date: 2005/10/24 16:00:47 $ + Version: $Revision: 1.55 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -19,7 +19,7 @@ #ifndef GDCMDOCENTRY_H #define GDCMDOCENTRY_H -#include "gdcmBase.h" +#include "gdcmRefCounter.h" #include "gdcmDictEntry.h" #include @@ -35,13 +35,11 @@ class SeqEntry; * \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 : public Base +class GDCM_EXPORT DocEntry : public RefCounter { -public: - DocEntry(DictEntry*); - /// \brief Canonical Destructor - virtual ~DocEntry() {} + gdcmTypeMacro(DocEntry); +public: virtual void Print (std::ostream &os = std::cout, std::string const &indent = ""); virtual void WriteContent(std::ofstream *fp, FileType filetype); @@ -67,7 +65,7 @@ public: /// Dictionnary, of the current Dicom entry VRKey const &GetVR() const { return DicomDict->GetVR(); } - /// \brief Returns the 'Value Multiplicity' (e.g. "1", "1-n", "6"), + /// \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(); } @@ -127,6 +125,9 @@ public: virtual void Copy(DocEntry *e); protected: + DocEntry(DictEntry*); + virtual ~DocEntry(); + /// \brief pointer to the underlying Dicom dictionary element DictEntry *DicomDict;