From 905a0960502b690eca89893e839759ffcb87c536 Mon Sep 17 00:00:00 2001 From: Owen Williams Date: Sun, 12 Jan 2014 11:45:27 -0500 Subject: Have WNumbers the NumberOfDigits parameter and set a default of 1 decimal. --- src/widget/wnumber.cpp | 12 ++++++------ src/widget/wnumberrate.cpp | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/widget/wnumber.cpp b/src/widget/wnumber.cpp index 9e598857b0..4117422124 100644 --- a/src/widget/wnumber.cpp +++ b/src/widget/wnumber.cpp @@ -24,7 +24,7 @@ WNumber::WNumber(QWidget* pParent) : WLabel(pParent), - m_iNoDigits(-1), + m_iNoDigits(1), m_dConstFactor(0.0) { } @@ -34,10 +34,10 @@ WNumber::~WNumber() { void WNumber::setup(QDomNode node, const SkinContext& context) { WLabel::setup(node, context); - // Number of digits - // TODO(rryan): This has been unused for a long time yet our skins specify - // this value all over the place. - m_iNoDigits = context.selectInt(node, "NumberOfDigits"); + // Number of digits after the decimal. + if (context.hasNode(node, "NumberOfDigits")) { + m_iNoDigits = context.selectInt(node, "NumberOfDigits"); + } // Constant factor if (context.hasNode(node, "ConstFactor")) { @@ -54,5 +54,5 @@ void WNumber::onConnectedControlValueChanged(double v) { void WNumber::setValue(double dValue) { double v = dValue + m_dConstFactor; - setText(QString(m_qsText).append(QString::number(v, 'f', 1))); + setText(QString(m_qsText).append(QString::number(v, 'f', m_iNoDigits))); } diff --git a/src/widget/wnumberrate.cpp b/src/widget/wnumberrate.cpp index 2844a784b0..ed1aac5e69 100644 --- a/src/widget/wnumberrate.cpp +++ b/src/widget/wnumberrate.cpp @@ -49,5 +49,5 @@ void WNumberRate::setValue(double) { } setText(QString(m_qsText).append(sign) - .append("%1").arg(fabs(vsign)*100., 0, 'f', 1)); + .append("%1").arg(fabs(vsign)*100., 0, 'f', m_iNoDigits)); } -- cgit v1.2.3