From be3643005779337a3680aa8e645a7b3ad3a46c68 Mon Sep 17 00:00:00 2001 From: f4exb Date: Tue, 16 Oct 2018 00:08:33 +0200 Subject: [PATCH] Channel Analyzer GUI: set sample rate via ScopeVis only --- plugins/channelrx/chanalyzer/chanalyzergui.cpp | 1 - plugins/channelrx/chanalyzer/chanalyzerplugin.cpp | 2 +- sdrgui/dsp/scopevis.cpp | 8 ++++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/plugins/channelrx/chanalyzer/chanalyzergui.cpp b/plugins/channelrx/chanalyzer/chanalyzergui.cpp index d9ae040f9..428b171cc 100644 --- a/plugins/channelrx/chanalyzer/chanalyzergui.cpp +++ b/plugins/channelrx/chanalyzer/chanalyzergui.cpp @@ -462,7 +462,6 @@ void ChannelAnalyzerGUI::setNewFinalRate() QString s = QString::number(m_rate/1000.0, 'f', 1); ui->spanText->setText(tr("%1 kS/s").arg(s)); - ui->glScope->setSampleRate(m_rate); m_scopeVis->setSampleRate(m_rate); } diff --git a/plugins/channelrx/chanalyzer/chanalyzerplugin.cpp b/plugins/channelrx/chanalyzer/chanalyzerplugin.cpp index 4d9bff02b..f25605b6d 100644 --- a/plugins/channelrx/chanalyzer/chanalyzerplugin.cpp +++ b/plugins/channelrx/chanalyzer/chanalyzerplugin.cpp @@ -23,7 +23,7 @@ const PluginDescriptor ChannelAnalyzerPlugin::m_pluginDescriptor = { QString("Channel Analyzer"), - QString("4.0.7"), + QString("4.2.3"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/sdrgui/dsp/scopevis.cpp b/sdrgui/dsp/scopevis.cpp index 2c2967281..31cb4ba65 100644 --- a/sdrgui/dsp/scopevis.cpp +++ b/sdrgui/dsp/scopevis.cpp @@ -76,10 +76,10 @@ ScopeVis::~ScopeVis() void ScopeVis::setSampleRate(int sampleRate) { - if (sampleRate != m_sampleRate) - { - m_sampleRate = sampleRate; - if (m_glScope) m_glScope->setSampleRate(m_sampleRate); + m_sampleRate = sampleRate; + + if (m_glScope) { + m_glScope->setSampleRate(m_sampleRate); } }