X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictEntry.h;h=2be34877348a41cc5102059deda8185d8573c4e0;hb=4cf608c37695b2385eebeb1426ca8cc87f1c8108;hp=cd329bd1d969134b2b829e7eda7891c50c309dda;hpb=55d77e0913ff360d639af1841c70d14dc8687584;p=gdcm.git diff --git a/src/gdcmDictEntry.h b/src/gdcmDictEntry.h index cd329bd1..2be34877 100644 --- a/src/gdcmDictEntry.h +++ b/src/gdcmDictEntry.h @@ -1,138 +1,75 @@ -// gdcmDictEntry.h -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmDictEntry.h,v $ + Language: C++ + Date: $Date: 2005/10/19 13:17:04 $ + Version: $Revision: 1.38 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #ifndef GDCMDICTENTRY_H #define GDCMDICTENTRY_H -#include "gdcmCommon.h" +#include "gdcmDicomEntry.h" +namespace gdcm +{ //----------------------------------------------------------------------------- -/* - * \defgroup gdcmDictEntry +/** * \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 Multplicity) + * - the corresponding name in english */ -class GDCM_EXPORT gdcmDictEntry +class GDCM_EXPORT DictEntry : public DicomEntry { public: - gdcmDictEntry(guint16 group, - guint16 element, - std::string vr = "Unknown", - std::string fourth = "Unknown", - std::string name = "Unknown"); - - static TagKey TranslateToKey(guint16 group, guint16 element); + DictEntry(uint16_t group, + uint16_t elem, + VRKey const &vr = GDCM_VRUNKNOWN, + TagName const &vm = GDCM_UNKNOWN, + TagName const &name = GDCM_UNKNOWN); - void SetVR(std::string); +// Print + void Print(std::ostream &os = std::cout, std::string const &indent = ""); - /** - * \ingroup gdcmDictEntry - * \brief tells if the V(alue) R(epresentation) is known (?!) - * - * @return - */ - inline bool IsVRUnknown() {return vr == "??"; } +// Content of DictEntry + virtual void SetVR(VRKey const &vr); + virtual void SetVM(TagName const &vm); + /// \brief returns the VM field of the current DictEntry + /// @return The 'Value Multiplicity' field + const TagName &GetVM() const { return VM; } - /** - * \ingroup gdcmDictEntry - * \brief returns the Dicom Group Number of the current gdcmDictEntry - * return the Dicom Group Number - */ - inline guint16 GetGroup(void) { return group; } - - /** - * \ingroup gdcmDictEntry - * \brief returns the Dicom Element Number of the current gdcmDictEntry - * return the Dicom Element Number - */ - inline guint16 GetElement(void) { return element; } - - /** - * \ingroup gdcmDictEntry - * \brief returns the Dicom Value Representation of the current gdcmDictEntry - * return the Dicom Value Representation - */ - inline std::string GetVR(void) { return vr; } - - /** - * \ingroup gdcmDictEntry - * \brief sets the key of the current gdcmDictEntry - * @param k New key to be set. - */ - inline void SetKey(std::string k) { key = k; } - - /** - * \ingroup gdcmDictEntry - * \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 - */ - inline std::string GetFourth(void) { return fourth; } + /// \brief tells if the V(alue) M(ultiplicity) is known (?!) + /// @return + bool IsVMUnknown() const { return VM == GDCM_UNKNOWN; } - /** - * \ingroup gdcmDictEntry - * \brief returns the Dicom Name of the current gdcmDictEntry - * \ e.g. "Patient Name" for Dicom Tag (0x0010, 0x0010) - * return the Dicom Name - */ - inline std::string GetName(void) { return name; } + /// \brief Returns the Dicom Name of the current DictEntry + /// e.g. "Patient Name" for Dicom Tag (0x0010, 0x0010) + /// @return the Dicom Name + const TagName &GetName() const { return Name; } - /** - * \ingroup gdcmDictEntry - * \brief Gets the key of the current gdcmDictEntry - * @return the key . - */ - inline std::string GetKey(void) { return key; } - private: - // FIXME : where are the group and element used except from building up - // a TagKey. 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 TagKey used for ? - - /// DicomGroup number - guint16 group; // e.g. 0x0010 - /// DicomElement number - guint16 element; // e.g. 0x0103 - /// Value Representation i.e. some clue about the nature - /// of the data represented e.g. "FD" short for - /// "Floating Point Double" - std::string vr; - - // CLEANME: find the official dicom name for this field ! - - ///Fourth field containing some semantics. - ///(Group Name abbr.) - /// DON'T USER ANY LONGER ! - std::string fourth; - /// e.g. "Patient_Name" - std::string name; - /// Redundant with (group, element) but we add it - /// on efficiency purposes. - TagKey key; - - // DCMTK has many fields for handling a DictEntry (see below). What are the - // relevant ones for gdcmlib ? - // struct DBI_SimpleEntry { - // Uint16 upperGroup; - // Uint16 upperElement; - // DcmEVR evr; - // const char* tagName; - // int vmMin; - // int vmMax; - // const char* standardVersion; - // DcmDictRangeRestriction groupRestriction; - // DcmDictRangeRestriction elementRestriction; - // }; -}; + /// \brief Value Multiplicity (e.g. "1", "1-n", "6") + TagName VM; + /// e.g. "Patient's Name" + TagName Name; +}; +} // end namespace gdcm //----------------------------------------------------------------------------- #endif