X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictEntry.h;h=24720c9369e9151fe7a1334cd27c837bd2f51c3e;hb=b06cbd9177331d793223eac6bf8b2bccf874e7e3;hp=5a2e8a07440e6e7d5d0d928ae148a7e91e84e726;hpb=fd37aa842b5d31ca266b6bda8a77f3201d02338d;p=gdcm.git diff --git a/src/gdcmDictEntry.h b/src/gdcmDictEntry.h index 5a2e8a07..24720c93 100644 --- a/src/gdcmDictEntry.h +++ b/src/gdcmDictEntry.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDictEntry.h,v $ Language: C++ - Date: $Date: 2004/09/27 08:39:06 $ - Version: $Revision: 1.16 $ + Date: $Date: 2007/09/17 12:16:02 $ + Version: $Revision: 1.47 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -16,156 +16,104 @@ =========================================================================*/ -#ifndef GDCMDICTENTRY_H -#define GDCMDICTENTRY_H +#ifndef _GDCMDICTENTRY_H_ +#define _GDCMDICTENTRY_H_ -#include "gdcmCommon.h" +#include "gdcmRefCounter.h" +#include "gdcmTagKey.h" +#include "gdcmVRKey.h" +namespace GDCM_NAME_SPACE +{ //----------------------------------------------------------------------------- -/* - * \defgroup gdcmDictEntry +class VRKey; +class TagKey; +/** * \brief - * the gdcmDictEntry in an element contained by the gdcmDict. + * the DictEntry in an element contained by the Dict. * It contains : * - the key referenced by the DICOM norm or the constructor (for private keys) - * - the corresponding name in english (it's equivalent to a label) - * - the owner group - * - etc. + * i.e. the Group number + * the Element number + * - the VR (Value Representation) + * - the VM (Value Multiplicity) + * - the corresponding name in english */ -class GDCM_EXPORT gdcmDictEntry +class GDCM_EXPORT DictEntry : public RefCounter { + gdcmTypeMacro(DictEntry); + public: - gdcmDictEntry(uint16_t group, - uint16_t element, - std::string vr = "Unknown", - std::string fourth = "Unknown", - std::string name = "Unknown"); + static DictEntry *New(uint16_t group, uint16_t elem, + VRKey const &vr = GDCM_VRUNKNOWN, + TagName const &vm = GDCM_UNKNOWN, + TagName const &name = GDCM_UNKNOWN); - static gdcmTagKey TranslateToKey(uint16_t group, uint16_t element); +// Print + void Print(std::ostream &os = std::cout, std::string const &indent = ""); - void SetVR(std::string); + /// \brief Returns the Dicom Group Number + /// @return the Dicom Group Number + const uint16_t &GetGroup() const { return Tag[0]; } + + /// \brief Returns the Dicom Element Number + /// @return the Dicom Element Number + const uint16_t &GetElement() const { return Tag[1]; } + /// \brief Set the Dicom Value Representation + /// \param vr the Dicom Value Representation + virtual void SetVR(VRKey const &vr) { VR = vr; } + /// \brief Returns the Dicom Value Representation + /// @return the Dicom Value Representation + const VRKey &GetVR() const { return VR; } /// \brief tells if the V(alue) R(epresentation) is known (?!) /// @return - bool IsVRUnknown() {return vr == "??"; } + bool IsVRUnknown() const { return VR == GDCM_VRUNKNOWN; } - /// \brief Returns the Dicom Group Number of the current gdcmDictEntry - /// @return the Dicom Group Number - uint16_t GetGroup() { return group; } - - /// \brief Returns the Dicom Element Number of the current gdcmDictEntry - /// @return the Dicom Element Number - uint16_t GetElement() { return element; } - - /// \brief Returns the Dicom Value Representation of the current - /// gdcmDictEntry - /// @return the Dicom Value Representation - std::string GetVR() { return vr; } - - /// \brief sets the key of the current gdcmDictEntry - /// @param k New key to be set. - void SetKey(std::string k) { key = k; } - - /// \brief returns the Fourth field of the current gdcmDictEntry - /// \warning NOT part of the Dicom Standard. - /// May be REMOVED an any time. NEVER use it. - /// @return The Fourth field - std::string GetFourth(void) { return fourth; } - - /// \brief Returns the Dicom Name of the current gdcmDictEntry + const TagKey &GetKey() const { return Tag; } + +// Key creation + static TagKey TranslateToKey(uint16_t group, uint16_t elem); + + /// \brief returns the VM field of the current DictEntry + /// @return The 'Value Multiplicity' field + const TagName &GetVM() const { return VM; } + /// \brief Set the VM field of the current DictEntry + /// \param vm the'Value Multiplicity' + virtual void SetVM(TagName const &vm) { VM = vm; } + /// \brief tells if the V(alue) M(ultiplicity) is known (?!) + /// @return + bool IsVMUnknown() const { return VM == GDCM_UNKNOWN; } + + /// \brief Returns the Dicom Name of the current DictEntry /// e.g. "Patient Name" for Dicom Tag (0x0010, 0x0010) /// @return the Dicom Name - std::string GetName(void) { return name; } - - /// \brief Gets the key of the current gdcmDictEntry - /// @return the key. - std::string GetKey(void) { return key; } + const TagName &GetName() const { return Name; } -private: - /// \todo FIXME - /// where are the group and element used except from building up - /// a gdcmTagKey. If the answer is nowhere then there is no need - /// to store the group and element independently. - /// - /// --> EVERYWHERE ! The alternate question would be : - /// What's gdcmTagKey used for ? - - /// DicomGroup number - uint16_t group; // e.g. 0x0010 +protected: + DictEntry(uint16_t group, uint16_t elem, + VRKey const &vr = GDCM_VRUNKNOWN, + TagName const &vm = GDCM_UNKNOWN, + TagName const &name = GDCM_UNKNOWN); - /// DicomElement number - uint16_t element; // e.g. 0x0103 + ~DictEntry(); + +private: + /// Dicom TagKey. Contains Dicom Group number and Dicom Element number + TagKey Tag; /// \brief Value Representation i.e. some clue about the nature - /// of the data represented e.g. "FD" short for - /// "Floating Point Double" (see \ref gdcmVR) - std::string vr; - - /** - * \brief AVOID using the following fourth field at all costs. - * - * They are at leat two good reasons for NOT using fourth: - * - the main reason is that it is NOT part of the 'official' - * Dicom Dictionnary. - * - a second reason is that it is not defined for all the groups. - * . - * Still it provides some semantics as group name abbreviation that - * can prove of some help when organizing things in an interface. - * For the time being we keep it in gdcm but it migth be removed in - * future releases it proves to be source of confusion. - * Here is a small dictionary we encountered in "nature": - * - CMD Command - * - META Meta Information - * - DIR Directory - * - ID ??? - * - PAT Patient - * - ACQ Acquisition - * - REL Related - * - IMG Image - * - SDY Study - * - VIS Visit - * - WAV Waveform - * - PRC ??? - * - DEV Device - * - NMI Nuclear Medicine - * - MED ??? - * - BFS Basic Film Session - * - BFB Basic Film Box - * - BIB Basic Image Box - * - BAB - * - IOB - * - PJ - * - PRINTER - * - RT Radio Therapy - * - DVH - * - SSET - * - RES Results - * - CRV Curve - * - OLY Overlays - * - PXL Pixels - * - DL Delimiters - * . - * - * Other usefull abreviations used for Radiographic view associated with - * Patient Position (0018,5100): - * - AP = Anterior/Posterior - * - PA = Posterior/Anterior - * - LL = Left Lateral - * - RL = Right Lateral - * - RLD = Right Lateral Decubitus - * - LLD = Left Lateral Decubitus - * - RLO = Right Lateral Oblique - * - LLO = Left Lateral Oblique - * . - */ - std::string fourth; - - /// e.g. "Patient's Name" - std::string name; - - /// Redundant with (group, element) but we add it on efficiency purposes. - gdcmTagKey key; -}; + /// of the data represented e.g. + /// - "FD" short for "Floating Point Double"(see VR) + /// - "PN" short for "Person Name" + VRKey VR; + + /// \brief Value Multiplicity (e.g. "1", "1-n", "2-n", "6") + TagName VM; + /// \brief English name of the entry (e.g. "Patient's Name") + TagName Name; +}; +} // end namespace gdcm //----------------------------------------------------------------------------- #endif