diff --git a/app/main.cpp b/app/main.cpp index 4a968b01f..89e4cbde8 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -35,7 +35,7 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo */ QCoreApplication::setOrganizationName("f4exb"); QCoreApplication::setApplicationName("SDRangel"); - QCoreApplication::setApplicationVersion("4.4.3"); + QCoreApplication::setApplicationVersion("4.4.4"); #if QT_VERSION >= 0x050600 QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps diff --git a/appbench/main.cpp b/appbench/main.cpp index d0e920058..3f68d863d 100644 --- a/appbench/main.cpp +++ b/appbench/main.cpp @@ -57,7 +57,7 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo QCoreApplication::setOrganizationName("f4exb"); QCoreApplication::setApplicationName("SDRangelBench"); - QCoreApplication::setApplicationVersion("4.4.3"); + QCoreApplication::setApplicationVersion("4.4.4"); int catchSignals[] = {SIGQUIT, SIGINT, SIGTERM, SIGHUP}; std::vector vsig(catchSignals, catchSignals + sizeof(catchSignals) / sizeof(int)); diff --git a/appsrv/main.cpp b/appsrv/main.cpp index c9071ca0c..d862d9523 100644 --- a/appsrv/main.cpp +++ b/appsrv/main.cpp @@ -56,7 +56,7 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo QCoreApplication::setOrganizationName("f4exb"); QCoreApplication::setApplicationName("SDRangelSrv"); - QCoreApplication::setApplicationVersion("4.4.3"); + QCoreApplication::setApplicationVersion("4.4.4"); int catchSignals[] = {SIGQUIT, SIGINT, SIGTERM, SIGHUP}; std::vector vsig(catchSignals, catchSignals + sizeof(catchSignals) / sizeof(int)); diff --git a/debian/changelog b/debian/changelog index 680f474c9..a33d84d4e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +sdrangel (4.4.4-1) unstable; urgency=medium + + * SoapySDR: fixed some GUI issues + + -- Edouard Griffiths, F4EXB Sun, 10 Feb 2019 10:14:18 +0100 + sdrangel (4.4.3-1) unstable; urgency=medium * Migration of SDRDaemon* devices to Remote* devices diff --git a/plugins/samplesink/soapysdroutput/soapysdroutputgui.ui b/plugins/samplesink/soapysdroutput/soapysdroutputgui.ui index f173efefd..985bb5c90 100644 --- a/plugins/samplesink/soapysdroutput/soapysdroutputgui.ui +++ b/plugins/samplesink/soapysdroutput/soapysdroutputgui.ui @@ -245,6 +245,9 @@ + + 4 + @@ -289,6 +292,13 @@ + + + + Qt::Horizontal + + + @@ -300,7 +310,7 @@ 0 0 318 - 53 + 49 diff --git a/plugins/samplesink/soapysdroutput/soapysdroutputplugin.cpp b/plugins/samplesink/soapysdroutput/soapysdroutputplugin.cpp index 3b950343d..403ecef85 100644 --- a/plugins/samplesink/soapysdroutput/soapysdroutputplugin.cpp +++ b/plugins/samplesink/soapysdroutput/soapysdroutputplugin.cpp @@ -31,7 +31,7 @@ const PluginDescriptor SoapySDROutputPlugin::m_pluginDescriptor = { QString("SoapySDR Output"), - QString("4.4.1"), + QString("4.4.4"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/samplesource/soapysdrinput/soapysdrinputgui.ui b/plugins/samplesource/soapysdrinput/soapysdrinputgui.ui index 0bb9c3aec..318cc6002 100644 --- a/plugins/samplesource/soapysdrinput/soapysdrinputgui.ui +++ b/plugins/samplesource/soapysdrinput/soapysdrinputgui.ui @@ -321,6 +321,9 @@ + + 4 + @@ -365,6 +368,13 @@ + + + + Qt::Horizontal + + + @@ -379,7 +389,7 @@ 0 0 318 - 53 + 49 diff --git a/plugins/samplesource/soapysdrinput/soapysdrinputplugin.cpp b/plugins/samplesource/soapysdrinput/soapysdrinputplugin.cpp index c0e81086b..7cc6ee843 100644 --- a/plugins/samplesource/soapysdrinput/soapysdrinputplugin.cpp +++ b/plugins/samplesource/soapysdrinput/soapysdrinputplugin.cpp @@ -30,7 +30,7 @@ const PluginDescriptor SoapySDRInputPlugin::m_pluginDescriptor = { QString("SoapySDR Input"), - QString("4.4.1"), + QString("4.4.4"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/sdrgui/soapygui/complexfactorgui.cpp b/sdrgui/soapygui/complexfactorgui.cpp index 57edb4e83..8163f739e 100644 --- a/sdrgui/soapygui/complexfactorgui.cpp +++ b/sdrgui/soapygui/complexfactorgui.cpp @@ -47,12 +47,16 @@ bool ComplexFactorGUI::getAutomatic() const void ComplexFactorGUI::setModule(double value) { - ui->module->setValue((int) (value < -1.0 ? -1.0 : value > 1.0 ? 1.0 : value)*100.0f); + double modValue = value < -1.0 ? -1.0 : value > 1.0 ? 1.0 : value; + ui->module->setValue((int) modValue*100.0f); + ui->moduleText->setText(tr("%1").arg(modValue, 0, 'f', 2)); } void ComplexFactorGUI::setArgument(double value) { - ui->module->setValue((int) (value < -180.0 ? -180.0 : value > 180.0 ? 180.0 : value)); + int argValue = (int) (value < -180.0 ? -180.0 : value > 180.0 ? 180.0 : value); + ui->arg->setValue(argValue); + ui->argText->setText(tr("%1").arg(value)); } void ComplexFactorGUI::setAutomatic(bool automatic) @@ -84,10 +88,12 @@ void ComplexFactorGUI::on_automatic_toggled(bool set) void ComplexFactorGUI::on_module_valueChanged(int value) { - emit moduleChanged(value / 100.0f); + ui->moduleText->setText(tr("%1").arg(value/100.0f, 0, 'f', 2)); + emit moduleChanged(value/100.0f); } void ComplexFactorGUI::on_arg_valueChanged(int value) { + ui->argText->setText(tr("%1").arg(value)); emit argumentChanged(value); } diff --git a/sdrgui/soapygui/complexfactorgui.ui b/sdrgui/soapygui/complexfactorgui.ui index d697b951f..dd65ba68a 100644 --- a/sdrgui/soapygui/complexfactorgui.ui +++ b/sdrgui/soapygui/complexfactorgui.ui @@ -6,8 +6,8 @@ 0 0 - 307 - 51 + 300 + 58 @@ -18,8 +18,8 @@ - 0 - 30 + 300 + 58 @@ -53,6 +53,9 @@ + + Automatic setting + Qt::RightToLeft @@ -67,6 +70,9 @@ QCheckBox::indicator::checked {background: rgb(255, 157, 38);} + + 0 + 6 @@ -91,7 +97,7 @@ QCheckBox::indicator::checked {background: rgb(255, 157, 38);} - Normalized module + Complex modulus normalized 0 @@ -143,7 +149,7 @@ QCheckBox::indicator::checked {background: rgb(255, 157, 38);} - Argument (angle) in degrees + Complex argument (angle) in degrees -180