X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictEntry.cxx;h=0bc2afa901276bded0774da7b48255373a2a723b;hb=8d4184fc7129f85d9ec384a3c7b9c5928a1f5b5e;hp=8823ac731748069d4a1df6b941f02fefc44f746e;hpb=0457e1e8fc68df6d9e2d1a0fcd0053ecee3c5ad7;p=gdcm.git diff --git a/src/gdcmDictEntry.cxx b/src/gdcmDictEntry.cxx index 8823ac73..0bc2afa9 100644 --- a/src/gdcmDictEntry.cxx +++ b/src/gdcmDictEntry.cxx @@ -1,21 +1,48 @@ // gdcmDictEntry.cxx +//----------------------------------------------------------------------------- +#include "gdcmDictEntry.h" #include // FIXME For sprintf -#include "gdcmDictEntry.h" #include "gdcmUtil.h" +//----------------------------------------------------------------------------- +// Constructor / Destructor +/** + * \ingroup gdcmDictEntry + * \brief Construtor + * @param InGroup + * @param InElement + * @param InVr + * @param InFourth // DO NOT use any longer + * NOT part of the Dicom Standard + * @param InName +*/ gdcmDictEntry::gdcmDictEntry(guint16 InGroup, guint16 InElement, - string InVr, string InFourth, - string InName) { - group = InGroup; + std::string InVr, std::string InFourth, + std::string InName) { + group = InGroup; element = InElement; vr = InVr; - fourth = InFourth; + fourth = InFourth; name = InName; key = TranslateToKey(group, element); } +//----------------------------------------------------------------------------- +// Print + +//----------------------------------------------------------------------------- +// Public +/** + * \ingroup gdcmDictEntry + * \brief concatenates 2 guint16 (supposed to be a Dicom group number + * and a Dicom element number) + * @param group the Dicom group number used to build the tag + * @param element the Dicom element number used to build the tag + * return the built tag + */ + TagKey gdcmDictEntry::TranslateToKey(guint16 group, guint16 element) { char trash[10]; TagKey key; @@ -29,20 +56,26 @@ TagKey gdcmDictEntry::TranslateToKey(guint16 group, guint16 element) { /** * \ingroup gdcmDictEntry - * \brief If-and only if-the vr is unset then overwrite it. - * @param NewVr New vr to be set. + * \brief If-and only if-the V(alue) R(epresentation) + * is unset then overwrite it. + * @param NewVr New V(alue) R(epresentation) to be set. */ -void gdcmDictEntry::SetVR(string NewVr) { - if ( IsVrUnknown() ) +void gdcmDictEntry::SetVR(std::string NewVr) +{ + if ( IsVRUnknown() ) vr = NewVr; - else { + else + { dbg.Error(true, "gdcmDictEntry::SetVR", "Overwriting vr might compromise a dictionary"); } } -bool gdcmDictEntry::IsVrUnknown() { - if ( vr == "Unknown" ) - return true; - return false; -} +//----------------------------------------------------------------------------- +// Protected + +//----------------------------------------------------------------------------- +// Private + +//----------------------------------------------------------------------------- +