X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomEntry.h;h=f5e469c7d2e4c8385a9373e1b5e72f7b7c53f816;hb=948a61ee55f77597a187134c7699e3f2021226ba;hp=b11e8c379612ecdfddcf7eac9f42310dc37e4fc7;hpb=46afb30d2d016a9b1581c7ee4ca96d614a35203c;p=gdcm.git diff --git a/src/gdcmDicomEntry.h b/src/gdcmDicomEntry.h index b11e8c37..f5e469c7 100644 --- a/src/gdcmDicomEntry.h +++ b/src/gdcmDicomEntry.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomEntry.h,v $ Language: C++ - Date: $Date: 2005/11/28 15:20:32 $ - Version: $Revision: 1.8 $ + Date: $Date: 2007/08/22 16:14:03 $ + Version: $Revision: 1.13 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -16,15 +16,15 @@ =========================================================================*/ -#ifndef GDCMDICOMENTRY_H -#define GDCMDICOMENTRY_H +#ifndef _GDCMDICOMENTRY_H_ +#define _GDCMDICOMENTRY_H_ #include "gdcmCommon.h" -#include "gdcmCommandManager.h" +#include "gdcmRefCounter.h" #include "gdcmVRKey.h" #include "gdcmTagKey.h" -namespace gdcm +namespace GDCM_NAME_SPACE { //----------------------------------------------------------------------------- /** @@ -39,7 +39,7 @@ namespace gdcm * - the VM (Value Multiplicity) * - the corresponding name in english */ -class GDCM_EXPORT DicomEntry : public CommandManager +class GDCM_EXPORT DicomEntry : public RefCounter { gdcmTypeMacro(DicomEntry); @@ -55,6 +55,10 @@ public: /// @return the Dicom Element Number const uint16_t &GetElement() const { return Tag[1]; } + /// \brief Returns the Dicom Tag Key + /// @return the Dicom Tag Key + const TagKey &GetKey() const { return Tag; } + /// \brief Set the Dicom Value Representation /// \param vr the Dicom Value Representation virtual void SetVR(VRKey const &vr) { VR = vr; } @@ -68,7 +72,8 @@ public: const TagKey &GetKey() const { return Tag; } // Key creation - static TagKey TranslateToKey(uint16_t group, uint16_t elem); + static TagKey TranslateToKey(uint16_t group, uint16_t elem) + { return TagKey(group,elem); } protected: DicomEntry(const uint16_t &group,const uint16_t &elt,