Program: gdcm
Module: $RCSfile: gdcmDictEntry.h,v $
Language: C++
- Date: $Date: 2004/06/20 18:08:47 $
- Version: $Revision: 1.14 $
+ Date: $Date: 2005/07/11 14:40:40 $
+ Version: $Revision: 1.35 $
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.htm for details.
+ 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
#ifndef GDCMDICTENTRY_H
#define GDCMDICTENTRY_H
-#include "gdcmCommon.h"
+#include "gdcmBase.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 Base
{
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);
-
- void SetVR(std::string);
-
- /**
- * \ingroup gdcmDictEntry
- * \brief tells if the V(alue) R(epresentation) is known (?!)
- *
- * @return
- */
- inline bool IsVRUnknown() {return vr == "??"; }
+ DictEntry(uint16_t group,
+ uint16_t elem,
+ TagName const &vr = GDCM_UNKNOWN,
+ TagName const &vm = GDCM_UNKNOWN,
+ TagName const &name = GDCM_UNKNOWN);
- /**
- * \ingroup gdcmDictEntry
- * \brief returns the Dicom Group Number of the current gdcmDictEntry
- * return the Dicom Group Number
- */
- inline guint16 GetGroup(void) { return group; }
+// Print
+ void Print(std::ostream &os = std::cout, std::string const &indent = "");
+
+// Content of DictEntry
+ void SetVR(TagName const &vr);
+ void SetVM(TagName const &vm);
+
+ /// \brief tells if the V(alue) R(epresentation) is known (?!)
+ /// @return
+ bool IsVRUnknown() { return VR == GDCM_UNKNOWN; }
+
+ /// \brief tells if the V(alue) M(ultiplicity) is known (?!)
+ /// @return
+ bool IsVMUnknown() { return VM == GDCM_UNKNOWN; }
+
+ /// \brief Returns the Dicom Group Number of the current DictEntry
+ /// @return the Dicom Group Number
+ uint16_t GetGroup() { 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; }
+ /// \brief Returns the Dicom Element Number of the current DictEntry
+ /// @return the Dicom Element Number
+ uint16_t GetElement() { 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; }
+ /// \brief Returns the Dicom Value Representation of the current
+ /// DictEntry
+ /// @return the Dicom Value Representation
+ const TagName &GetVR() const { 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; }
+ /// \brief sets the key of the current DictEntry
+ /// @param k New key to be set.
+ void SetKey(TagKey const &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 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 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; }
+ /// \brief Gets the key of the current DictEntry
+ /// @return the key.
+ const TagKey &GetKey() const { return Key; }
+
+// Key creation
+ static TagKey TranslateToKey(uint16_t group, uint16_t elem);
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 ?
+ /// \todo FIXME
+ /// where are the group and elem used except from building up
+ /// a TagKey. If the answer is nowhere then there is no need
+ /// to store the group and elem independently.
+ ///
+ /// --> EVERYWHERE ! The alternate question would be :
+ /// What's TagKey used for ?
/// DicomGroup number
- guint16 group; // e.g. 0x0010
+ uint16_t Group; // e.g. 0x0010
+
/// DicomElement number
- guint16 element; // e.g. 0x0103
- /**
- * \ingroup gdcmDictEntry
- * \brief Value Representation i.e. some clue about the nature
- * of the data represented
- * e.g. "FD" short for "Floating Point Double"
- */
- 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.
+ uint16_t Element; // e.g. 0x0103
+
+ /// \brief Value Representation i.e. some clue about the nature
+ /// of the data represented e.g.
+ /// "FD" short for "Floating Point Double"(see \ref VR)
+ /// "PN" short for "Person Name"
+ TagName VR;
+
+ /*
* .
- * 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.
+ * Formerly 'Group name abbreviations'
* Here is a small dictionary we encountered in "nature":
* - CMD Command
* - META Meta Information
* - LLO = Left Lateral Oblique
* .
*/
- std::string fourth;
+ /// \brief Value Multiplicity (e.g. "1", "1-n", "6")
+ TagName VM;
/// e.g. "Patient's 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;
- // };
-};
+ TagName Name;
+ /// Redundant with (group, elem) but we add it for efficiency purpose.
+ TagKey Key;
+};
+} // end namespace gdcm
//-----------------------------------------------------------------------------
#endif
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff