From 9c1a38a8cff59e0dc59cf85aef4a1f21eb5f8df4 Mon Sep 17 00:00:00 2001 From: f4exb Date: Fri, 9 Jun 2017 01:03:56 +0200 Subject: [PATCH] SDRdaemonFEC: implemented value dial for desired center frequency --- .../sdrdaemonsink/sdrdaemonsinkgui.ui | 2 +- .../sdrdaemonfec/sdrdaemonfecgui.cpp | 21 +++---- .../sdrdaemonfec/sdrdaemonfecgui.h | 2 +- .../sdrdaemonfec/sdrdaemonfecgui.ui | 62 ++++++++++--------- 4 files changed, 44 insertions(+), 43 deletions(-) diff --git a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.ui b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.ui index 6f8e1e5e7..5a83c0d17 100644 --- a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.ui +++ b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.ui @@ -280,7 +280,7 @@ - Dt + UDly diff --git a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.cpp b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.cpp index 779b753da..7d53461eb 100644 --- a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.cpp +++ b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.cpp @@ -86,10 +86,13 @@ SDRdaemonFECGui::SDRdaemonFECGui(DeviceSourceAPI *deviceAPI, QWidget* parent) : ui->setupUi(this); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); - ui->centerFrequency->setValueRange(7, 0, pow(10,7)); + ui->centerFrequency->setValueRange(7, 0, 9999999U); + + ui->freq->setColorMapper(ColorMapper(ColorMapper::GrayGold)); + ui->freq->setValueRange(7, 0, 9999999U); ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow)); - ui->sampleRate->setValueRange(7, 32000U, 9000000U); + ui->sampleRate->setValueRange(7, 32000U, 9999999U); connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus())); m_statusTimer.start(500); @@ -311,7 +314,7 @@ void SDRdaemonFECGui::displaySettings() ui->centerFrequency->setValue(m_settings.m_centerFrequency / 1000); ui->deviceRateText->setText(tr("%1k").arg(m_sampleRate / 1000.0)); - ui->freq->setText(QString::number(m_settings.m_centerFrequency / 1000)); + ui->freq->setValue(m_settings.m_centerFrequency / 1000); ui->decim->setCurrentIndex(m_settings.m_log2Decim); ui->fcPos->setCurrentIndex(m_settings.m_fcPos); ui->sampleRate->setValue(m_settings.m_sampleRate); @@ -546,16 +549,10 @@ void SDRdaemonFECGui::on_iqImbalance_toggled(bool checked) } } -void SDRdaemonFECGui::on_freq_returnPressed() +void SDRdaemonFECGui::on_freq_changed(quint64 value) { - bool ok; - uint64_t freq = ui->freq->text().toInt(&ok); - - if (ok) - { - m_settings.m_centerFrequency = freq * 1000; - sendControl(); - } + m_settings.m_centerFrequency = value * 1000; + sendControl(); } void SDRdaemonFECGui::on_sampleRate_changed(quint64 value) diff --git a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.h b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.h index 8634fa682..3f000586b 100644 --- a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.h +++ b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.h @@ -130,7 +130,7 @@ private slots: void on_dataPort_returnPressed(); void on_controlPort_returnPressed(); void on_sendButton_clicked(bool checked); - void on_freq_returnPressed(); + void on_freq_changed(quint64 value); void on_sampleRate_changed(quint64 value); void on_specificParms_returnPressed(); void on_decim_currentIndexChanged(int index); diff --git a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.ui b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.ui index f1fbb241c..ec978e129 100644 --- a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.ui +++ b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.ui @@ -737,27 +737,31 @@ - + + + + 0 + 0 + + - 0 - 0 + 32 + 16 - - - 100 - 16777215 - + + + DejaVu Sans Mono + 12 + false + + + + PointingHandCursor - Set center frequency (kHz) - - - 00000000 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Desired device center frequency @@ -791,7 +795,7 @@ - Dt + UDly @@ -886,6 +890,19 @@ + + + + Qt::Horizontal + + + + 40 + 20 + + + + @@ -988,19 +1005,6 @@ - - - - Qt::Horizontal - - - - 40 - 20 - - - -