VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-15 12:51:49 -05:00
Code Issues Projects Releases Wiki Activity

Renamed Channel Analyzer NG to Channel Analyzer (3)

Browse Source
This commit is contained in:
f4exb 2018-05-30 15:49:28 +02:00
parent e24e924d2b
commit 264c08b4c3
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/channelrx/chanalyzer/chanalyzer.cpp
View File

@ -194,7 +194,7 @@ bool ChannelAnalyzer::handleMessage(const Message& cmd)
if (DownChannelizer::MsgChannelizerNotification::match(cmd)) if (DownChannelizer::MsgChannelizerNotification::match(cmd))
{ {
DownChannelizer::MsgChannelizerNotification& notif = (DownChannelizer::MsgChannelizerNotification&) cmd; DownChannelizer::MsgChannelizerNotification& notif = (DownChannelizer::MsgChannelizerNotification&) cmd;
qDebug() << "ChannelAnalyzerNG::handleMessage: DownChannelizer::MsgChannelizerNotification:" qDebug() << "ChannelAnalyzer::handleMessage: DownChannelizer::MsgChannelizerNotification:"
<< " sampleRate: " << notif.getSampleRate() << " sampleRate: " << notif.getSampleRate()
<< " frequencyOffset: " << notif.getFrequencyOffset(); << " frequencyOffset: " << notif.getFrequencyOffset();
@ -211,7 +211,7 @@ bool ChannelAnalyzer::handleMessage(const Message& cmd)
else if (MsgConfigureChannelizer::match(cmd)) else if (MsgConfigureChannelizer::match(cmd))
{ {
MsgConfigureChannelizer& cfg = (MsgConfigureChannelizer&) cmd; MsgConfigureChannelizer& cfg = (MsgConfigureChannelizer&) cmd;
qDebug() << "ChannelAnalyzerNG::handleMessage: MsgConfigureChannelizer:" qDebug() << "ChannelAnalyzer::handleMessage: MsgConfigureChannelizer:"
<< " sampleRate: " << cfg.getSampleRate() << " sampleRate: " << cfg.getSampleRate()
<< " centerFrequency: " << cfg.getCenterFrequency(); << " centerFrequency: " << cfg.getCenterFrequency();
@ -223,7 +223,7 @@ bool ChannelAnalyzer::handleMessage(const Message& cmd)
} }
else if (MsgConfigureChannelAnalyzer::match(cmd)) else if (MsgConfigureChannelAnalyzer::match(cmd))
{ {
qDebug("ChannelAnalyzerNG::handleMessage: MsgConfigureChannelAnalyzer"); qDebug("ChannelAnalyzer::handleMessage: MsgConfigureChannelAnalyzer");
MsgConfigureChannelAnalyzer& cfg = (MsgConfigureChannelAnalyzer&) cmd; MsgConfigureChannelAnalyzer& cfg = (MsgConfigureChannelAnalyzer&) cmd;
applySettings(cfg.getSettings(), cfg.getForce()); applySettings(cfg.getSettings(), cfg.getForce());
@ -245,7 +245,7 @@ bool ChannelAnalyzer::handleMessage(const Message& cmd)
void ChannelAnalyzer::applyChannelSettings(int inputSampleRate, int inputFrequencyOffset, bool force) void ChannelAnalyzer::applyChannelSettings(int inputSampleRate, int inputFrequencyOffset, bool force)
{ {
qDebug() << "ChannelAnalyzerNG::applyChannelSettings:" qDebug() << "ChannelAnalyzer::applyChannelSettings:"
<< " inputSampleRate: " << inputSampleRate << " inputSampleRate: " << inputSampleRate
<< " inputFrequencyOffset: " << inputFrequencyOffset; << " inputFrequencyOffset: " << inputFrequencyOffset;
@ -279,7 +279,7 @@ void ChannelAnalyzer::applyChannelSettings(int inputSampleRate, int inputFrequen
void ChannelAnalyzer::setFilters(int sampleRate, float bandwidth, float lowCutoff) 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); sampleRate, bandwidth, lowCutoff);
if (bandwidth < 0) if (bandwidth < 0)
@ -306,7 +306,7 @@ void ChannelAnalyzer::setFilters(int sampleRate, float bandwidth, float lowCutof
void ChannelAnalyzer::applySettings(const ChannelAnalyzerSettings& settings, bool force) void ChannelAnalyzer::applySettings(const ChannelAnalyzerSettings& settings, bool force)
{ {
qDebug() << "ChannelAnalyzerNG::applySettings:" qDebug() << "ChannelAnalyzer::applySettings:"
<< " m_downSample: " << settings.m_downSample << " m_downSample: " << settings.m_downSample
<< " m_downSampleRate: " << settings.m_downSampleRate << " m_downSampleRate: " << settings.m_downSampleRate
<< " m_rcc: " << settings.m_rrc << " m_rcc: " << settings.m_rrc

8
plugins/channelrx/chanalyzer/chanalyzergui.cpp
View File

@ -144,7 +144,7 @@ void ChannelAnalyzerGUI::displayPLLSettings()
void ChannelAnalyzerGUI::setSpectrumDisplay() void ChannelAnalyzerGUI::setSpectrumDisplay()
{ {
qDebug("ChannelAnalyzerNGGUI::setSpectrumDisplay: m_rate: %d", m_rate); qDebug("ChannelAnalyzerGUI::setSpectrumDisplay: m_rate: %d", m_rate);
if (m_settings.m_ssb) if (m_settings.m_ssb)
{ {
ui->glSpectrum->setCenterFrequency(m_rate/4); ui->glSpectrum->setCenterFrequency(m_rate/4);
@ -187,7 +187,7 @@ bool ChannelAnalyzerGUI::handleMessage(const Message& message)
{ {
if (ChannelAnalyzer::MsgReportChannelSampleRateChanged::match(message)) if (ChannelAnalyzer::MsgReportChannelSampleRateChanged::match(message))
{ {
qDebug() << "ChannelAnalyzerNGGUI::handleMessage: MsgReportChannelSampleRateChanged"; qDebug() << "ChannelAnalyzerGUI::handleMessage: MsgReportChannelSampleRateChanged";
ui->channelSampleRate->setValueRange(7, 2000U, m_channelAnalyzer->getInputSampleRate()); ui->channelSampleRate->setValueRange(7, 2000U, m_channelAnalyzer->getInputSampleRate());
ui->channelSampleRate->setValue(m_settings.m_downSampleRate); ui->channelSampleRate->setValue(m_settings.m_downSampleRate);
setNewFinalRate(); setNewFinalRate();
@ -374,7 +374,7 @@ void ChannelAnalyzerGUI::onMenuDialogCalled(const QPoint& p)
ChannelAnalyzerGUI::ChannelAnalyzerGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel, QWidget* parent) : ChannelAnalyzerGUI::ChannelAnalyzerGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel, QWidget* parent) :
RollupWidget(parent), RollupWidget(parent),
ui(new Ui::ChannelAnalyzerNGGUI), ui(new Ui::ChannelAnalyzerGUI),
m_pluginAPI(pluginAPI), m_pluginAPI(pluginAPI),
m_deviceUISet(deviceUISet), m_deviceUISet(deviceUISet),
m_channelMarker(this), m_channelMarker(this),
@ -456,7 +456,7 @@ void ChannelAnalyzerGUI::setNewFinalRate()
if (m_rate == 0) { if (m_rate == 0) {
m_rate = 48000; 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(); setFiltersUIBoundaries();

4
plugins/channelrx/chanalyzer/chanalyzergui.h
View File

@ -35,7 +35,7 @@ class SpectrumVis;
class ScopeVisNG; class ScopeVisNG;
namespace Ui { namespace Ui {
class ChannelAnalyzerNGGUI; class ChannelAnalyzerGUI;
} }
class ChannelAnalyzerGUI : public RollupWidget, public PluginInstanceGUI { class ChannelAnalyzerGUI : public RollupWidget, public PluginInstanceGUI {
@ -61,7 +61,7 @@ public slots:
void channelMarkerHighlightedByCursor(); void channelMarkerHighlightedByCursor();
private: private:
Ui::ChannelAnalyzerNGGUI* ui; Ui::ChannelAnalyzerGUI* ui;
PluginAPI* m_pluginAPI; PluginAPI* m_pluginAPI;
DeviceUISet* m_deviceUISet; DeviceUISet* m_deviceUISet;
ChannelMarker m_channelMarker; ChannelMarker m_channelMarker;

4
plugins/channelrx/chanalyzer/chanalyzergui.ui
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>ChannelAnalyzerNGGUI</class> <class>ChannelAnalyzerGUI</class>
<widget class="RollupWidget" name="ChannelAnalyzerNGGUI"> <widget class="RollupWidget" name="ChannelAnalyzerGUI">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>

2
plugins/channelrx/chanalyzer/chanalyzersettings.cpp
View File

@ -114,7 +114,7 @@ bool ChannelAnalyzerSettings::deserialize(const QByteArray& data)
d.readU32(13, &m_pllPskOrder, 1); d.readU32(13, &m_pllPskOrder, 1);
d.readS32(14, &tmp, 0); d.readS32(14, &tmp, 0);
m_inputType = (InputType) tmp; 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.readBool(16, &m_rrc, false);
d.readU32(17, &m_rrcRolloff, 35); d.readU32(17, &m_rrcRolloff, 35);