From 7195600cb6268546724803011c599a954820de38 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sun, 19 Jul 2020 11:45:35 +0200 Subject: [PATCH] Channel Analyzer: fixed rational downsampler setting after range calculation --- plugins/channelrx/chanalyzer/chanalyzergui.cpp | 9 +++++---- plugins/channelrx/chanalyzer/chanalyzergui.h | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/plugins/channelrx/chanalyzer/chanalyzergui.cpp b/plugins/channelrx/chanalyzer/chanalyzergui.cpp index 76b812b91..d2fd7648d 100644 --- a/plugins/channelrx/chanalyzer/chanalyzergui.cpp +++ b/plugins/channelrx/chanalyzer/chanalyzergui.cpp @@ -463,15 +463,16 @@ ChannelAnalyzerGUI::~ChannelAnalyzerGUI() void ChannelAnalyzerGUI::setSinkSampleRate() { - unsigned int channelSampleRate = m_basebandSampleRate / (1<rationalDownSamplerRate->setValueRange(7, 0.5*channelSampleRate, channelSampleRate); + ui->rationalDownSamplerRate->setValueRange(7, 0.5*nominalSinkSampleRate, nominalSinkSampleRate); ui->rationalDownSamplerRate->setValue(m_settings.m_rationalDownSamplerRate); + m_settings.m_rationalDownSamplerRate = ui->rationalDownSamplerRate->getValueNew(); unsigned int sinkSampleRate = getSinkSampleRate(); - qDebug("ChannelAnalyzerGUI::setSinkSampleRate: channelSampleRate: %u sinkSampleRate: %u", - channelSampleRate, sinkSampleRate); + qDebug("ChannelAnalyzerGUI::setSinkSampleRate: nominalSinkSampleRate: %u sinkSampleRate: %u", + nominalSinkSampleRate, sinkSampleRate); setFiltersUIBoundaries(); diff --git a/plugins/channelrx/chanalyzer/chanalyzergui.h b/plugins/channelrx/chanalyzer/chanalyzergui.h index b930a4b14..6e0ff6bd5 100644 --- a/plugins/channelrx/chanalyzer/chanalyzergui.h +++ b/plugins/channelrx/chanalyzer/chanalyzergui.h @@ -77,7 +77,7 @@ private: ScopeVis* m_scopeVis; MessageQueue m_inputMessageQueue; - explicit ChannelAnalyzerGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel, QWidget* parent = 0); + explicit ChannelAnalyzerGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel, QWidget* parent = nullptr); virtual ~ChannelAnalyzerGUI(); int getSinkSampleRate(); //!< get actual sink sample rate from GUI settings