VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-10 10:33:29 -05:00
Code Issues Projects Releases Wiki Activity

Renamed SpectrumScopeNGComboVis to SpectrumScopeComboVis

Browse Source
This commit is contained in:
f4exb 2018-08-12 17:10:31 +02:00
parent b7b9c8af8a
commit 37ab2e442e
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -387,8 +387,8 @@ ChannelAnalyzerGUI::ChannelAnalyzerGUI(PluginAPI* pluginAPI, DeviceUISet *device
m_spectrumVis = new SpectrumVis(SDR_RX_SCALEF, ui->glSpectrum); m_spectrumVis = new SpectrumVis(SDR_RX_SCALEF, ui->glSpectrum);
m_scopeVis = new ScopeVisNG(ui->glScope); m_scopeVis = new ScopeVisNG(ui->glScope);
m_spectrumScopeComboVis = new SpectrumScopeNGComboVis(m_spectrumVis, m_scopeVis); m_spectrumScopeComboVis = new SpectrumScopeComboVis(m_spectrumVis, m_scopeVis);
m_channelAnalyzer = (ChannelAnalyzer*) rxChannel; //new ChannelAnalyzerNG(m_deviceUISet->m_deviceSourceAPI); m_channelAnalyzer = (ChannelAnalyzer*) rxChannel; //new ChannelAnalyzer(m_deviceUISet->m_deviceSourceAPI);
m_channelAnalyzer->setSampleSink(m_spectrumScopeComboVis); m_channelAnalyzer->setSampleSink(m_spectrumScopeComboVis);
m_channelAnalyzer->setMessageQueueToGUI(getInputMessageQueue()); m_channelAnalyzer->setMessageQueueToGUI(getInputMessageQueue());

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

@ -30,7 +30,7 @@ class PluginAPI;
class DeviceUISet; class DeviceUISet;
class BasebandSampleSink; class BasebandSampleSink;
class ChannelAnalyzer; class ChannelAnalyzer;
class SpectrumScopeNGComboVis; class SpectrumScopeComboVis;
class SpectrumVis; class SpectrumVis;
class ScopeVisNG; class ScopeVisNG;
@ -71,7 +71,7 @@ private:
MovingAverageUtil<double, double, 40> m_channelPowerAvg; MovingAverageUtil<double, double, 40> m_channelPowerAvg;
ChannelAnalyzer* m_channelAnalyzer; ChannelAnalyzer* m_channelAnalyzer;
SpectrumScopeNGComboVis* m_spectrumScopeComboVis; SpectrumScopeComboVis* m_spectrumScopeComboVis;
SpectrumVis* m_spectrumVis; SpectrumVis* m_spectrumVis;
ScopeVisNG* m_scopeVis; ScopeVisNG* m_scopeVis;
MessageQueue m_inputMessageQueue; MessageQueue m_inputMessageQueue;

14
sdrgui/dsp/spectrumscopengcombovis.cpp
View File

@ -2,37 +2,37 @@
#include "dsp/dspcommands.h" #include "dsp/dspcommands.h"
#include "util/messagequeue.h" #include "util/messagequeue.h"
SpectrumScopeNGComboVis::SpectrumScopeNGComboVis(SpectrumVis* spectrumVis, ScopeVisNG* scopeVis) : SpectrumScopeComboVis::SpectrumScopeComboVis(SpectrumVis* spectrumVis, ScopeVisNG* scopeVis) :
m_spectrumVis(spectrumVis), m_spectrumVis(spectrumVis),
m_scopeVis(scopeVis) m_scopeVis(scopeVis)
{ {
setObjectName("SpectrumScopeNGComboVis"); setObjectName("SpectrumScopeComboVis");
} }
SpectrumScopeNGComboVis::~SpectrumScopeNGComboVis() SpectrumScopeComboVis::~SpectrumScopeComboVis()
{ {
} }
void SpectrumScopeNGComboVis::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly __attribute__((unused))) void SpectrumScopeComboVis::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly __attribute__((unused)))
{ {
m_scopeVis->feed(begin, end, false); m_scopeVis->feed(begin, end, false);
SampleVector::const_iterator triggerPoint = m_scopeVis->getTriggerPoint(); SampleVector::const_iterator triggerPoint = m_scopeVis->getTriggerPoint();
m_spectrumVis->feedTriggered(triggerPoint, end, positiveOnly); m_spectrumVis->feedTriggered(triggerPoint, end, positiveOnly);
} }
void SpectrumScopeNGComboVis::start() void SpectrumScopeComboVis::start()
{ {
m_spectrumVis->start(); m_spectrumVis->start();
m_scopeVis->start(); m_scopeVis->start();
} }
void SpectrumScopeNGComboVis::stop() void SpectrumScopeComboVis::stop()
{ {
m_spectrumVis->stop(); m_spectrumVis->stop();
m_scopeVis->stop(); m_scopeVis->stop();
} }
bool SpectrumScopeNGComboVis::handleMessage(const Message& message) bool SpectrumScopeComboVis::handleMessage(const Message& message)
{ {
bool spectDone = m_spectrumVis->handleMessage(message); bool spectDone = m_spectrumVis->handleMessage(message);
bool scopeDone = m_scopeVis->handleMessage(message); bool scopeDone = m_scopeVis->handleMessage(message);

6
sdrgui/dsp/spectrumscopengcombovis.h
View File

@ -8,11 +8,11 @@
class Message; class Message;
class SDRGUI_API SpectrumScopeNGComboVis : public BasebandSampleSink { class SDRGUI_API SpectrumScopeComboVis : public BasebandSampleSink {
public: public:
SpectrumScopeNGComboVis(SpectrumVis* spectrumVis, ScopeVisNG* scopeVis); SpectrumScopeComboVis(SpectrumVis* spectrumVis, ScopeVisNG* scopeVis);
virtual ~SpectrumScopeNGComboVis(); virtual ~SpectrumScopeComboVis();
virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly); virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly);
virtual void start(); virtual void start();