VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed value dial typing in values problems. Issue #97

This commit is contained in:
f4exb 2017-11-18 03:51:46 +01:00
parent cf9309bba8
commit 382a825614
4 changed files with 43 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
sdrgui/gui/valuedial.cpp
View File

@ -45,16 +45,6 @@ ValueDial::ValueDial(QWidget* parent, ColorMapper colorMapper) :
m_background.setColorAt(cmit->first, cmit->second);
}
/*
m_background.setColorAt(0.0, QColor(0x40, 0x40, 0x40));
m_background.setColorAt(0.1, QColor(0xc0, 0xc0, 0xc0));
m_background.setColorAt(0.2, QColor(0xf0, 0xf0, 0xf0));
m_background.setColorAt(0.5, QColor(0xff, 0xff, 0xff));
m_background.setColorAt(0.8, QColor(0xd0, 0xd0, 0xd0));
m_background.setColorAt(0.9, QColor(0xa0, 0xa0, 0xa0));
m_background.setColorAt(1.0, QColor(0x40, 0x40, 0x40));
*/
m_value = 0;
m_valueMin = 0;
m_valueMax = 2200000;
@ -66,7 +56,10 @@ ValueDial::ValueDial(QWidget* parent, ColorMapper colorMapper) :
m_text = formatText(m_value);
m_cursorState = false;
connect(&m_animationTimer, SIGNAL(timeout()), this, SLOT(animate()));
const QLocale & cLocale = QLocale::c();
m_groupSeparator = cLocale.groupSeparator();
connect(&m_animationTimer, SIGNAL(timeout()), this, SLOT(animate()));
connect(&m_blinkTimer, SIGNAL(timeout()), this, SLOT(blink()));
}
@ -216,7 +209,7 @@ void ValueDial::paintEvent(QPaintEvent*)
painter.setClipRect(1 + i * m_digitWidth, 1, m_digitWidth, m_digitHeight * 2);
painter.setPen(m_colorMapper.getSecondaryForegroundColor());
painter.drawText(QRect(1 + i * m_digitWidth, m_digitHeight * 0.6, m_digitWidth, m_digitHeight), Qt::AlignCenter, m_text.mid(i, 1));
if(m_text[i] != QChar('.')) {
if(m_text[i] != m_groupSeparator) {
painter.setPen(m_colorMapper.getForegroundColor());
painter.drawText(QRect(1 + i * m_digitWidth, m_digitHeight * -0.7, m_digitWidth, m_digitHeight), Qt::AlignCenter, digitNeigh(m_text[i], true));
painter.drawText(QRect(1 + i * m_digitWidth, m_digitHeight * 1.9, m_digitWidth, m_digitHeight), Qt::AlignCenter, digitNeigh(m_text[i], false));
@ -235,7 +228,7 @@ void ValueDial::paintEvent(QPaintEvent*)
painter.setClipRect(1 + i * m_digitWidth, 1, m_digitWidth, m_digitHeight * 2);
painter.setPen(m_colorMapper.getSecondaryForegroundColor());
painter.drawText(QRect(1 + i * m_digitWidth, m_digitHeight * 0.6, m_digitWidth, m_digitHeight), Qt::AlignCenter, m_text.mid(i, 1));
if(m_text[i] != QChar('.')) {
if(m_text[i] != m_groupSeparator) {
painter.setPen(m_colorMapper.getForegroundColor());
painter.drawText(QRect(1 + i * m_digitWidth, m_digitHeight * -0.7, m_digitWidth, m_digitHeight), Qt::AlignCenter, digitNeigh(m_text[i], true));
painter.drawText(QRect(1 + i * m_digitWidth, m_digitHeight * 1.9, m_digitWidth, m_digitHeight), Qt::AlignCenter, digitNeigh(m_text[i], false));
@ -245,7 +238,7 @@ void ValueDial::paintEvent(QPaintEvent*)
painter.setClipRect(1 + i * m_digitWidth, 1, m_digitWidth, m_digitHeight * 2);
painter.setPen(m_colorMapper.getSecondaryForegroundColor());
painter.drawText(QRect(1 + i * m_digitWidth, h, m_digitWidth, m_digitHeight), Qt::AlignCenter, m_text.mid(i, 1));
if(m_text[i] != QChar('.')) {
if(m_text[i] != m_groupSeparator) {
painter.setPen(m_colorMapper.getForegroundColor());
painter.drawText(QRect(1 + i * m_digitWidth, h + m_digitHeight * -0.7, m_digitWidth, m_digitHeight), Qt::AlignCenter, digitNeigh(m_text[i], true));
painter.drawText(QRect(1 + i * m_digitWidth, h + m_digitHeight * 1.9, m_digitWidth, m_digitHeight), Qt::AlignCenter, digitNeigh(m_text[i], false));
@ -262,7 +255,7 @@ void ValueDial::mousePressEvent(QMouseEvent* event)
i = (event->x() - 1) / m_digitWidth;
if(m_text[i] == QChar('.'))
if(m_text[i] == m_groupSeparator)
{
i++;
@ -303,7 +296,7 @@ void ValueDial::mouseMoveEvent(QMouseEvent* event)
int i;
i = (event->x() - 1) / m_digitWidth;
if(m_text[i] == QChar('.'))
if(m_text[i] == m_groupSeparator)
i = -1;
if(i != m_hightlightedDigit) {
@ -317,7 +310,7 @@ void ValueDial::wheelEvent(QWheelEvent* event)
int i;
i = (event->x() - 1) / m_digitWidth;
if(m_text[i] != QChar('.'))
if(m_text[i] != m_groupSeparator)
m_hightlightedDigit = i;
else
return;
@ -376,7 +369,7 @@ void ValueDial::keyPressEvent(QKeyEvent* value)
if((m_cursor < 0) && (m_hightlightedDigit >= 0)) {
m_cursor = m_hightlightedDigit;
if(m_text[m_cursor] == QChar('.'))
if(m_text[m_cursor] == m_groupSeparator)
m_cursor++;
if(m_cursor >= m_numDigits + m_numDecimalPoints)
return;
@ -391,7 +384,7 @@ void ValueDial::keyPressEvent(QKeyEvent* value)
if((value->key() == Qt::Key_Left) || (value->key() == Qt::Key_Backspace)) {
if(m_cursor > 0) {
m_cursor--;
if(m_text[m_cursor] == QChar('.'))
if(m_text[m_cursor] == m_groupSeparator)
m_cursor--;
if(m_cursor < 0)
m_cursor++;
@ -402,7 +395,7 @@ void ValueDial::keyPressEvent(QKeyEvent* value)
} else if(value->key() == Qt::Key_Right) {
if(m_cursor < m_numDecimalPoints + m_numDigits) {
m_cursor++;
if(m_text[m_cursor] == QChar('.'))
if(m_text[m_cursor] == m_groupSeparator)
m_cursor++;
if(m_cursor >= m_numDecimalPoints + m_numDigits)
m_cursor--;
@ -455,7 +448,7 @@ void ValueDial::keyPressEvent(QKeyEvent* value)
setValue(v);
emit changed(m_valueNew);
m_cursor++;
if(m_text[m_cursor] == QChar('.'))
if(m_text[m_cursor] == m_groupSeparator)
m_cursor++;
if(m_cursor >= m_numDigits + m_numDecimalPoints) {
m_cursor = -1;

1
sdrgui/gui/valuedial.h
View File

@ -56,6 +56,7 @@ private:
int m_animationState;
QTimer m_animationTimer;
QTimer m_blinkTimer;
QChar m_groupSeparator;
ColorMapper m_colorMapper;

40
sdrgui/gui/valuedialz.cpp
View File

@ -60,6 +60,9 @@ ValueDialZ::ValueDialZ(bool positiveOnly, QWidget* parent, ColorMapper colorMapp
m_text = formatText(m_value);
m_cursorState = false;
const QLocale & cLocale = QLocale::c();
m_groupSeparator = cLocale.groupSeparator();
connect(&m_animationTimer, SIGNAL(timeout()), this, SLOT(animate()));
connect(&m_blinkTimer, SIGNAL(timeout()), this, SLOT(blink()));
}
@ -195,8 +198,7 @@ QString ValueDialZ::formatText(qint64 value)
int ipoint = m_numDigits + (m_positiveOnly ? 0 : 1) - 3 - 3 * i;
if (ipoint != 0) { // do not insert leading point
const QLocale & cLocale = QLocale::c();
str.insert(ipoint, cLocale.groupSeparator());
str.insert(ipoint, m_groupSeparator);
}
}
@ -251,7 +253,7 @@ void ValueDialZ::paintEvent(QPaintEvent*)
painter.setPen(m_colorMapper.getSecondaryForegroundColor());
painter.drawText(QRect(1 + i * m_digitWidth, m_digitHeight * 0.6, m_digitWidth, m_digitHeight), Qt::AlignCenter, m_text.mid(i, 1));
if(m_text[i] != QChar('.'))
if(m_text[i] != m_groupSeparator)
{
painter.setPen(m_colorMapper.getForegroundColor());
painter.drawText(QRect(1 + i * m_digitWidth, m_digitHeight * -0.7, m_digitWidth, m_digitHeight), Qt::AlignCenter, digitNeigh(m_text[i], true));
@ -280,7 +282,7 @@ void ValueDialZ::paintEvent(QPaintEvent*)
painter.setPen(m_colorMapper.getSecondaryForegroundColor());
painter.drawText(QRect(1 + i * m_digitWidth, m_digitHeight * 0.6, m_digitWidth, m_digitHeight), Qt::AlignCenter, m_text.mid(i, 1));
if(m_text[i] != QChar('.'))
if(m_text[i] != m_groupSeparator)
{
painter.setPen(m_colorMapper.getForegroundColor());
painter.drawText(QRect(1 + i * m_digitWidth, m_digitHeight * -0.7, m_digitWidth, m_digitHeight), Qt::AlignCenter, digitNeigh(m_text[i], true));
@ -294,7 +296,7 @@ void ValueDialZ::paintEvent(QPaintEvent*)
painter.setPen(m_colorMapper.getSecondaryForegroundColor());
painter.drawText(QRect(1 + i * m_digitWidth, h, m_digitWidth, m_digitHeight), Qt::AlignCenter, m_text.mid(i, 1));
if(m_text[i] != QChar('.'))
if(m_text[i] != m_groupSeparator)
{
painter.setPen(m_colorMapper.getForegroundColor());
painter.drawText(QRect(1 + i * m_digitWidth, h + m_digitHeight * -0.7, m_digitWidth, m_digitHeight), Qt::AlignCenter, digitNeigh(m_text[i], true));
@ -314,7 +316,7 @@ void ValueDialZ::mousePressEvent(QMouseEvent* event)
if (m_positiveOnly)
if ((m_text[i] == QChar('.')) || (m_text[i] == QChar('+')) || (m_text[i] == QChar('-')))
if ((m_text[i] == m_groupSeparator) || (m_text[i] == QChar('+')) || (m_text[i] == QChar('-')))
{
i++;
@ -358,7 +360,7 @@ void ValueDialZ::mouseMoveEvent(QMouseEvent* event)
i = (event->x() - 1) / m_digitWidth;
if(m_text[i] == QChar('.'))
if(m_text[i] == m_groupSeparator)
{
i = -1;
}
@ -376,7 +378,7 @@ void ValueDialZ::wheelEvent(QWheelEvent* event)
i = (event->x() - 1) / m_digitWidth;
if (m_text[i] != QChar('.'))
if (m_text[i] != m_groupSeparator)
{
m_hightlightedDigit = i;
}
@ -455,7 +457,7 @@ void ValueDialZ::keyPressEvent(QKeyEvent* value)
{
m_cursor = m_hightlightedDigit;
if (m_text[m_cursor] == QChar('.')) {
if (m_text[m_cursor] == m_groupSeparator) {
m_cursor++;
}
@ -478,7 +480,7 @@ void ValueDialZ::keyPressEvent(QKeyEvent* value)
{
m_cursor--;
if (m_text[m_cursor] == QChar('.')) {
if (m_text[m_cursor] == m_groupSeparator) {
m_cursor--;
}
@ -497,7 +499,7 @@ void ValueDialZ::keyPressEvent(QKeyEvent* value)
{
m_cursor++;
if (m_text[m_cursor] == QChar('.')) {
if (m_text[m_cursor] == m_groupSeparator) {
m_cursor++;
}
@ -577,7 +579,19 @@ void ValueDialZ::keyPressEvent(QKeyEvent* value)
QChar c = value->text()[0];
if(c >= QChar('0') && (c <= QChar('9')))
if ((c == QChar('+')) && (m_cursor == 0) && (m_text[m_cursor] == QChar('-'))) // change sign to positive
{
setValue(-m_value);
emit changed(m_valueNew);
update();
}
else if ((c == QChar('-')) && (m_cursor == 0) && (m_text[m_cursor] == QChar('+'))) // change sign to negative
{
setValue(-m_value);
emit changed(m_valueNew);
update();
}
else if ((c >= QChar('0')) && (c <= QChar('9')) && (m_cursor > 0)) // digits
{
int d = c.toLatin1() - '0';
quint64 e = findExponent(m_cursor);
@ -590,7 +604,7 @@ void ValueDialZ::keyPressEvent(QKeyEvent* value)
emit changed(m_valueNew);
m_cursor++;
if ((m_text[m_cursor] == QChar('.')) || (m_text[m_cursor] == QChar('+')) || (m_text[m_cursor] == QChar('-'))) {
if (m_text[m_cursor] == m_groupSeparator) {
m_cursor++;
}

1
sdrgui/gui/valuedialz.h
View File

@ -60,6 +60,7 @@ private:
int m_animationState;
QTimer m_animationTimer;
QTimer m_blinkTimer;
QChar m_groupSeparator;
ColorMapper m_colorMapper;