X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictEntry.cxx;h=bdabafbec3e943cf05fa9fe32abaa4528e664e73;hb=c8d390d6a732aa48eeb9d831ea83f4bebc8e19f8;hp=1e135cb65dae7045e178320209bfad79d0e3628b;hpb=b6e445adae1963909952eeef10ea7c1d2e0d3e0d;p=gdcm.git diff --git a/src/gdcmDictEntry.cxx b/src/gdcmDictEntry.cxx index 1e135cb6..bdabafbe 100644 --- a/src/gdcmDictEntry.cxx +++ b/src/gdcmDictEntry.cxx @@ -1,31 +1,48 @@ // gdcmDictEntry.cxx - -//This is needed when compiling in debug mode -#ifdef _MSC_VER -// 'identifier' : class 'type' needs to have dll-interface to be used by -// clients of class 'type2' -#pragma warning ( disable : 4251 ) -// 'identifier' : identifier was truncated to 'number' characters in the -// debug information -#pragma warning ( disable : 4786 ) -#endif //_MSC_VER +//----------------------------------------------------------------------------- +#include "gdcmDictEntry.h" #include // FIXME For sprintf -#include "gdcmDictEntry.h" #include "gdcmUtil.h" +//----------------------------------------------------------------------------- +// Constructor / Destructor +/** + * \ingroup gdcmDictEntry + * \brief Constructor + * @param InGroup DICOM-Group Number + * @param InElement DICOM-Element Number + * @param InVr Value Representatiion + * @param InFourth // DO NOT use any longer; + * NOT part of the Dicom Standard + * @param InName description of the element +*/ gdcmDictEntry::gdcmDictEntry(guint16 InGroup, guint16 InElement, std::string InVr, std::string InFourth, std::string InName) { - group = InGroup; - element = InElement; - vr = InVr; - fourth = InFourth; - name = InName; - key = TranslateToKey(group, element); + group = InGroup; + element = InElement; + vr = InVr; + 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; @@ -39,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(std::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 + +//----------------------------------------------------------------------------- +