From a7fabd5f58076b75bd74364f067c662965b82deb Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Sun, 2 Apr 2017 03:34:03 +0200
Subject: [PATCH] RTLSDR plugin: fixed sample rate display and update

---
 plugins/samplesource/rtlsdr/rtlsdrgui.cpp | 15 ++++++++-------
 plugins/samplesource/rtlsdr/rtlsdrgui.h   |  2 +-
 plugins/samplesource/rtlsdr/rtlsdrgui.ui  |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/plugins/samplesource/rtlsdr/rtlsdrgui.cpp b/plugins/samplesource/rtlsdr/rtlsdrgui.cpp
index daa0dc2c2..d6660fa9e 100644
--- a/plugins/samplesource/rtlsdr/rtlsdrgui.cpp
+++ b/plugins/samplesource/rtlsdr/rtlsdrgui.cpp
@@ -40,8 +40,8 @@ RTLSDRGui::RTLSDRGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
 	ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::ReverseGold));
 	ui->centerFrequency->setValueRange(7, 24000U, 1900000U);
 
-    ui->newSampleRate->setColorMapper(ColorMapper(ColorMapper::ReverseGreenYellow));
-    ui->newSampleRate->setValueRange(7, 950000U, 2400000U);
+    ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::ReverseGreenYellow));
+    ui->sampleRate->setValueRange(7, 950000U, 2400000U);
 
 	connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(updateHardware()));
 	connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus()));
@@ -190,12 +190,13 @@ void RTLSDRGui::updateSampleRateAndFrequency()
 {
     m_deviceAPI->getSpectrum()->setSampleRate(m_sampleRate);
     m_deviceAPI->getSpectrum()->setCenterFrequency(m_deviceCenterFrequency);
-    ui->deviceRateText->setText(tr("%1k").arg((float)m_sampleRate / 1000));
+    ui->deviceRateText->setText(tr("%1k").arg(QString::number(m_sampleRate / 1000.0f, 'g', 5)));
 }
 
 void RTLSDRGui::displaySettings()
 {
 	ui->centerFrequency->setValue(m_settings.m_centerFrequency / 1000);
+	ui->sampleRate->setValue(m_settings.m_devSampleRate);
 	ui->dcOffset->setChecked(m_settings.m_dcBlock);
 	ui->iqImbalance->setChecked(m_settings.m_iqImbalance);
 	ui->ppm->setValue(m_settings.m_loPpmCorrection);
@@ -392,7 +393,7 @@ void RTLSDRGui::on_checkBox_stateChanged(int state)
 	sendSettings();
 }
 
-void RTLSDRGui::on_newSampleRate_changed(quint64 value)
+void RTLSDRGui::on_sampleRate_changed(quint64 value)
 {
     m_settings.m_devSampleRate = value;
     sendSettings();
@@ -401,12 +402,12 @@ void RTLSDRGui::on_newSampleRate_changed(quint64 value)
 void RTLSDRGui::on_lowSampleRate_toggled(bool checked)
 {
     if (checked) {
-        ui->newSampleRate->setValueRange(7, 230000U, 300000U);
+        ui->sampleRate->setValueRange(7, 230000U, 300000U);
     } else {
-        ui->newSampleRate->setValueRange(7, 950000U, 2400000U);
+        ui->sampleRate->setValueRange(7, 950000U, 2400000U);
     }
 
-    m_settings.m_devSampleRate = ui->newSampleRate->getValueNew();
+    m_settings.m_devSampleRate = ui->sampleRate->getValueNew();
     qDebug("RTLSDRGui::on_lowSampleRate_toggled: %d S/s", m_settings.m_devSampleRate);
     sendSettings();
 }
diff --git a/plugins/samplesource/rtlsdr/rtlsdrgui.h b/plugins/samplesource/rtlsdr/rtlsdrgui.h
index 06313c2be..db0c9d46b 100644
--- a/plugins/samplesource/rtlsdr/rtlsdrgui.h
+++ b/plugins/samplesource/rtlsdr/rtlsdrgui.h
@@ -68,7 +68,7 @@ private:
 private slots:
     void handleDSPMessages();
 	void on_centerFrequency_changed(quint64 value);
-	void on_newSampleRate_changed(quint64 value);
+	void on_sampleRate_changed(quint64 value);
 	void on_lowSampleRate_toggled(bool checked);
 	void on_dcOffset_toggled(bool checked);
 	void on_iqImbalance_toggled(bool checked);
diff --git a/plugins/samplesource/rtlsdr/rtlsdrgui.ui b/plugins/samplesource/rtlsdr/rtlsdrgui.ui
index be7d0546a..987ad5602 100644
--- a/plugins/samplesource/rtlsdr/rtlsdrgui.ui
+++ b/plugins/samplesource/rtlsdr/rtlsdrgui.ui
@@ -339,7 +339,7 @@
       </widget>
      </item>
      <item>
-      <widget class="ValueDial" name="newSampleRate" native="true">
+      <widget class="ValueDial" name="sampleRate" native="true">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
          <horstretch>0</horstretch>