VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-09-11 03:07:57 -04:00
Code Issues Projects Releases Wiki Activity

Fixed keyboard input for negative values on realtive integer value dials (issue #168)

Browse Source
This commit is contained in:
f4exb 2018-05-08 10:10:15 +02:00
parent 0c946d86e2
commit 4bb63bbf1b
5 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/main.cpp
View File

@ -35,7 +35,7 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo
*/ */
QCoreApplication::setOrganizationName("f4exb"); QCoreApplication::setOrganizationName("f4exb");
QCoreApplication::setApplicationName("SDRangel"); QCoreApplication::setApplicationName("SDRangel");
QCoreApplication::setApplicationVersion("3.14.5"); QCoreApplication::setApplicationVersion("3.14.6");
#if 1 #if 1
qApp->setStyle(QStyleFactory::create("fusion")); qApp->setStyle(QStyleFactory::create("fusion"));

2
appbench/main.cpp
View File

@ -57,7 +57,7 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo
QCoreApplication::setOrganizationName("f4exb"); QCoreApplication::setOrganizationName("f4exb");
QCoreApplication::setApplicationName("SDRangelBench"); QCoreApplication::setApplicationName("SDRangelBench");
QCoreApplication::setApplicationVersion("3.14.5"); QCoreApplication::setApplicationVersion("3.14.6");
int catchSignals[] = {SIGQUIT, SIGINT, SIGTERM, SIGHUP}; int catchSignals[] = {SIGQUIT, SIGINT, SIGTERM, SIGHUP};
std::vector<int> vsig(catchSignals, catchSignals + sizeof(catchSignals) / sizeof(int)); std::vector<int> vsig(catchSignals, catchSignals + sizeof(catchSignals) / sizeof(int));

2
appsrv/main.cpp
View File

@ -56,7 +56,7 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo
QCoreApplication::setOrganizationName("f4exb"); QCoreApplication::setOrganizationName("f4exb");
QCoreApplication::setApplicationName("SDRangelSrv"); QCoreApplication::setApplicationName("SDRangelSrv");
QCoreApplication::setApplicationVersion("3.14.5"); QCoreApplication::setApplicationVersion("3.14.6");
int catchSignals[] = {SIGQUIT, SIGINT, SIGTERM, SIGHUP}; int catchSignals[] = {SIGQUIT, SIGINT, SIGTERM, SIGHUP};
std::vector<int> vsig(catchSignals, catchSignals + sizeof(catchSignals) / sizeof(int)); std::vector<int> vsig(catchSignals, catchSignals + sizeof(catchSignals) / sizeof(int));

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
sdrangel (3.14.6-1) unstable; urgency=medium
* Fixed keyboard input for negative values on realtive integer value dials
-- Edouard Griffiths, F4EXB <f4exb06@gmail.com> Sun, 13 May 2018 20:14:18 +0200
sdrangel (3.14.5-1) unstable; urgency=medium sdrangel (3.14.5-1) unstable; urgency=medium
* DSD demod: allow audio rates integer multiples of 8k other than 48k * DSD demod: allow audio rates integer multiples of 8k other than 48k

13
sdrgui/gui/valuedialz.cpp
View File

@ -599,12 +599,17 @@ void ValueDialZ::keyPressEvent(QKeyEvent* value)
{ {
int d = c.toLatin1() - '0'; int d = c.toLatin1() - '0';
quint64 e = findExponent(m_cursor); quint64 e = findExponent(m_cursor);
quint64 v = (m_value / e) % 10; quint64 value = abs(m_value);
if(m_animationState != 0) int sign = m_value < 0 ? -1 : 1;
quint64 v = (value / e) % 10;
if(m_animationState != 0) {
m_value = m_valueNew; m_value = m_valueNew;
v = m_value - v * e; }
v = value - v * e;
v += d * e; v += d * e;
setValue(v); setValue(sign*v);
emit changed(m_valueNew); emit changed(m_valueNew);
m_cursor++; m_cursor++;