From 264c08b4c3a4cccc912c221445e3eb9b7a2ea6fb Mon Sep 17 00:00:00 2001 From: f4exb Date: Wed, 30 May 2018 15:49:28 +0200 Subject: [PATCH] Renamed Channel Analyzer NG to Channel Analyzer (3) --- plugins/channelrx/chanalyzer/chanalyzer.cpp | 12 ++++++------ plugins/channelrx/chanalyzer/chanalyzergui.cpp | 8 ++++---- plugins/channelrx/chanalyzer/chanalyzergui.h | 4 ++-- plugins/channelrx/chanalyzer/chanalyzergui.ui | 4 ++-- plugins/channelrx/chanalyzer/chanalyzersettings.cpp | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/plugins/channelrx/chanalyzer/chanalyzer.cpp b/plugins/channelrx/chanalyzer/chanalyzer.cpp index 26c8f1698..ac3a059ae 100644 --- a/plugins/channelrx/chanalyzer/chanalyzer.cpp +++ b/plugins/channelrx/chanalyzer/chanalyzer.cpp @@ -194,7 +194,7 @@ bool ChannelAnalyzer::handleMessage(const Message& cmd) if (DownChannelizer::MsgChannelizerNotification::match(cmd)) { DownChannelizer::MsgChannelizerNotification& notif = (DownChannelizer::MsgChannelizerNotification&) cmd; - qDebug() << "ChannelAnalyzerNG::handleMessage: DownChannelizer::MsgChannelizerNotification:" + qDebug() << "ChannelAnalyzer::handleMessage: DownChannelizer::MsgChannelizerNotification:" << " sampleRate: " << notif.getSampleRate() << " frequencyOffset: " << notif.getFrequencyOffset(); @@ -211,7 +211,7 @@ bool ChannelAnalyzer::handleMessage(const Message& cmd) else if (MsgConfigureChannelizer::match(cmd)) { MsgConfigureChannelizer& cfg = (MsgConfigureChannelizer&) cmd; - qDebug() << "ChannelAnalyzerNG::handleMessage: MsgConfigureChannelizer:" + qDebug() << "ChannelAnalyzer::handleMessage: MsgConfigureChannelizer:" << " sampleRate: " << cfg.getSampleRate() << " centerFrequency: " << cfg.getCenterFrequency(); @@ -223,7 +223,7 @@ bool ChannelAnalyzer::handleMessage(const Message& cmd) } else if (MsgConfigureChannelAnalyzer::match(cmd)) { - qDebug("ChannelAnalyzerNG::handleMessage: MsgConfigureChannelAnalyzer"); + qDebug("ChannelAnalyzer::handleMessage: MsgConfigureChannelAnalyzer"); MsgConfigureChannelAnalyzer& cfg = (MsgConfigureChannelAnalyzer&) cmd; applySettings(cfg.getSettings(), cfg.getForce()); @@ -245,7 +245,7 @@ bool ChannelAnalyzer::handleMessage(const Message& cmd) void ChannelAnalyzer::applyChannelSettings(int inputSampleRate, int inputFrequencyOffset, bool force) { - qDebug() << "ChannelAnalyzerNG::applyChannelSettings:" + qDebug() << "ChannelAnalyzer::applyChannelSettings:" << " inputSampleRate: " << inputSampleRate << " inputFrequencyOffset: " << inputFrequencyOffset; @@ -279,7 +279,7 @@ void ChannelAnalyzer::applyChannelSettings(int inputSampleRate, int inputFrequen void ChannelAnalyzer::setFilters(int sampleRate, float bandwidth, float lowCutoff) { - qDebug("ChannelAnalyzerNG::setFilters: sampleRate: %d bandwidth: %f lowCutoff: %f", + qDebug("ChannelAnalyzer::setFilters: sampleRate: %d bandwidth: %f lowCutoff: %f", sampleRate, bandwidth, lowCutoff); if (bandwidth < 0) @@ -306,7 +306,7 @@ void ChannelAnalyzer::setFilters(int sampleRate, float bandwidth, float lowCutof void ChannelAnalyzer::applySettings(const ChannelAnalyzerSettings& settings, bool force) { - qDebug() << "ChannelAnalyzerNG::applySettings:" + qDebug() << "ChannelAnalyzer::applySettings:" << " m_downSample: " << settings.m_downSample << " m_downSampleRate: " << settings.m_downSampleRate << " m_rcc: " << settings.m_rrc diff --git a/plugins/channelrx/chanalyzer/chanalyzergui.cpp b/plugins/channelrx/chanalyzer/chanalyzergui.cpp index a340f6888..81a5c84aa 100644 --- a/plugins/channelrx/chanalyzer/chanalyzergui.cpp +++ b/plugins/channelrx/chanalyzer/chanalyzergui.cpp @@ -144,7 +144,7 @@ void ChannelAnalyzerGUI::displayPLLSettings() void ChannelAnalyzerGUI::setSpectrumDisplay() { - qDebug("ChannelAnalyzerNGGUI::setSpectrumDisplay: m_rate: %d", m_rate); + qDebug("ChannelAnalyzerGUI::setSpectrumDisplay: m_rate: %d", m_rate); if (m_settings.m_ssb) { ui->glSpectrum->setCenterFrequency(m_rate/4); @@ -187,7 +187,7 @@ bool ChannelAnalyzerGUI::handleMessage(const Message& message) { if (ChannelAnalyzer::MsgReportChannelSampleRateChanged::match(message)) { - qDebug() << "ChannelAnalyzerNGGUI::handleMessage: MsgReportChannelSampleRateChanged"; + qDebug() << "ChannelAnalyzerGUI::handleMessage: MsgReportChannelSampleRateChanged"; ui->channelSampleRate->setValueRange(7, 2000U, m_channelAnalyzer->getInputSampleRate()); ui->channelSampleRate->setValue(m_settings.m_downSampleRate); setNewFinalRate(); @@ -374,7 +374,7 @@ void ChannelAnalyzerGUI::onMenuDialogCalled(const QPoint& p) ChannelAnalyzerGUI::ChannelAnalyzerGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel, QWidget* parent) : RollupWidget(parent), - ui(new Ui::ChannelAnalyzerNGGUI), + ui(new Ui::ChannelAnalyzerGUI), m_pluginAPI(pluginAPI), m_deviceUISet(deviceUISet), m_channelMarker(this), @@ -456,7 +456,7 @@ void ChannelAnalyzerGUI::setNewFinalRate() if (m_rate == 0) { m_rate = 48000; } - qDebug("ChannelAnalyzerNGGUI::setNewFinalRate: %d m_spanLog2: %d", m_rate, m_settings.m_spanLog2); + qDebug("ChannelAnalyzerGUI::setNewFinalRate: %d m_spanLog2: %d", m_rate, m_settings.m_spanLog2); setFiltersUIBoundaries(); diff --git a/plugins/channelrx/chanalyzer/chanalyzergui.h b/plugins/channelrx/chanalyzer/chanalyzergui.h index e62a19218..5210b2171 100644 --- a/plugins/channelrx/chanalyzer/chanalyzergui.h +++ b/plugins/channelrx/chanalyzer/chanalyzergui.h @@ -35,7 +35,7 @@ class SpectrumVis; class ScopeVisNG; namespace Ui { - class ChannelAnalyzerNGGUI; + class ChannelAnalyzerGUI; } class ChannelAnalyzerGUI : public RollupWidget, public PluginInstanceGUI { @@ -61,7 +61,7 @@ public slots: void channelMarkerHighlightedByCursor(); private: - Ui::ChannelAnalyzerNGGUI* ui; + Ui::ChannelAnalyzerGUI* ui; PluginAPI* m_pluginAPI; DeviceUISet* m_deviceUISet; ChannelMarker m_channelMarker; diff --git a/plugins/channelrx/chanalyzer/chanalyzergui.ui b/plugins/channelrx/chanalyzer/chanalyzergui.ui index 73bb3bdbb..d052da7f3 100644 --- a/plugins/channelrx/chanalyzer/chanalyzergui.ui +++ b/plugins/channelrx/chanalyzer/chanalyzergui.ui @@ -1,7 +1,7 @@ - ChannelAnalyzerNGGUI - + ChannelAnalyzerGUI + 0 diff --git a/plugins/channelrx/chanalyzer/chanalyzersettings.cpp b/plugins/channelrx/chanalyzer/chanalyzersettings.cpp index dd931e667..02fe476e6 100644 --- a/plugins/channelrx/chanalyzer/chanalyzersettings.cpp +++ b/plugins/channelrx/chanalyzer/chanalyzersettings.cpp @@ -114,7 +114,7 @@ bool ChannelAnalyzerSettings::deserialize(const QByteArray& data) d.readU32(13, &m_pllPskOrder, 1); d.readS32(14, &tmp, 0); m_inputType = (InputType) tmp; - d.readString(15, &m_title, "Channel Analyzer NG"); + d.readString(15, &m_title, "Channel Analyzer"); d.readBool(16, &m_rrc, false); d.readU32(17, &m_rrcRolloff, 35);