diff --git a/src/widgets/thermowidget.cpp b/src/widgets/thermowidget.cpp index 4d2ca60..9fa7515 100644 --- a/src/widgets/thermowidget.cpp +++ b/src/widgets/thermowidget.cpp @@ -1,103 +1,111 @@ #include "thermowidget.h" #include #include #include #include #include #include ThermoWidget::ThermoWidget(QWidget *parent) : QwtDial(parent), m_currentTemperatureNeedle(new QwtDialSimpleNeedle(QwtDialSimpleNeedle::Arrow)), m_targetTemperatureNeedle(new QwtDialSimpleNeedle(QwtDialSimpleNeedle::Arrow, Qt::red, Qt::darkRed)) { setScaleArc(40, 320); setNeedle(m_currentTemperatureNeedle); setReadOnly(false); setFocusPolicy(Qt::StrongFocus); m_currentTemperature = 0; m_targetTemperature = 0; } void ThermoWidget::keyPressEvent(QKeyEvent* ev) { if (ev->key() >= Qt::Key_0 && ev->key() <= Qt::Key_9) { auto tmp = m_currentTemperatureTextFromEditor + ev->key(); if (tmp.toInt() <= upperBound() && tmp.toInt() >= lowerBound()) { m_currentTemperatureTextFromEditor = tmp; } } else if (ev->key() == Qt::Key_Backspace && m_currentTemperatureTextFromEditor.count()) { m_currentTemperatureTextFromEditor.remove(m_currentTemperatureTextFromEditor.count() - 1, 1); } else if (ev->key() == Qt::Key_Enter) { m_targetTemperature = m_currentTemperatureTextFromEditor.toInt(); } else if (ev->key() == Qt::Key_Escape) { m_currentTemperatureTextFromEditor = '0'; + } else if (ev->key() == Qt::Key_Up || ev->key() == Qt::Key_Right) { + if (m_targetTemperature != upperBound()) { + m_currentTemperatureTextFromEditor = QString::number(m_targetTemperature + 1); + } + } else if (ev->key() == Qt::Key_Down || ev->key() == Qt::Key_Left) { + if (m_targetTemperature != lowerBound()) { + m_currentTemperatureTextFromEditor = QString::number(m_targetTemperature - 1); + } } else { QwtDial::keyPressEvent(ev); return; } if (m_targetTemperature != m_currentTemperatureTextFromEditor.toInt()) { m_targetTemperature = m_currentTemperatureTextFromEditor.toInt(); emit targetTemperatureChanged(m_targetTemperature); update(); } } void ThermoWidget::focusOutEvent(QFocusEvent*) { if (m_targetTemperature != m_currentTemperatureTextFromEditor.toInt()) { m_targetTemperature = m_currentTemperatureTextFromEditor.toInt(); emit targetTemperatureChanged(m_targetTemperature); update(); } } void ThermoWidget::paintEvent(QPaintEvent* ev) { QwtDial::paintEvent(ev); QFontMetrics fm(font()); const double width = fm.width(m_currentTemperatureTextFromEditor); const double height = fm.height(); const double xpos = (geometry().width() / 2) - (width / 2); const double ypos = geometry().height() - height * 2 - 2; QPainter p(this); p.setBrush(Qt::white); p.setPen(Qt::white); p.drawText(xpos, ypos, m_currentTemperatureTextFromEditor); } void ThermoWidget::drawNeedle( QPainter *painter, const QPointF ¢er, double radius, double dir, QPalette::ColorGroup colorGroup ) const { Q_UNUSED( dir ); const double relativePercent = upperBound() - lowerBound(); const double currentTemperaturePercent = (m_currentTemperature - lowerBound()) / relativePercent; const double targetTemperaturePercent = (m_targetTemperature - lowerBound()) / relativePercent; const double currentTemperatureAngle = (maxScaleArc() - minScaleArc()) * currentTemperaturePercent + minScaleArc(); const double targetTemperatureAngle = (maxScaleArc() - minScaleArc()) * targetTemperaturePercent + minScaleArc(); m_targetTemperatureNeedle->draw(painter, center, radius, 360 - targetTemperatureAngle - origin(), colorGroup); m_currentTemperatureNeedle->draw(painter, center, radius, 360 - currentTemperatureAngle - origin(), colorGroup); } void ThermoWidget::setCurrentTemperature(double temperature) { if (m_currentTemperature != temperature) { m_currentTemperature = temperature; update(); } } void ThermoWidget::setTargetTemperature(double temperature) { if (m_targetTemperature != temperature) { m_currentTemperatureTextFromEditor = QString::number(temperature); m_targetTemperature = temperature; emit targetTemperatureChanged(m_targetTemperature); update(); } }