VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-08-06 15:52:28 -04:00
Code Issues Projects Releases Wiki Activity

Revert "RadioClock: moved ScopeVis to plugin core"

Browse Source 
This reverts commit 4ac6c54f95bfc3e0fcdd65125724ed8c94a0d8b2.
This commit is contained in:
f4exb 2021-07-13 17:42:14 +02:00
parent 86ceb245cd
commit d98046f615
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/channelrx/radioclock/radioclock.cpp
View File

@ -55,7 +55,6 @@ RadioClock::RadioClock(DeviceAPI *deviceAPI) :
setObjectName(m_channelId); setObjectName(m_channelId);
m_basebandSink = new RadioClockBaseband(this); m_basebandSink = new RadioClockBaseband(this);
m_basebandSink->setScopeSink(&m_scopeSink);
m_basebandSink->setMessageQueueToChannel(getInputMessageQueue()); m_basebandSink->setMessageQueueToChannel(getInputMessageQueue());
m_basebandSink->setChannel(this); m_basebandSink->setChannel(this);
m_basebandSink->moveToThread(&m_thread); m_basebandSink->moveToThread(&m_thread);
@ -170,6 +169,11 @@ bool RadioClock::handleMessage(const Message& cmd)
} }
} }
ScopeVis *RadioClock::getScopeSink()
{
return m_basebandSink->getScopeSink();
}
void RadioClock::applySettings(const RadioClockSettings& settings, bool force) void RadioClock::applySettings(const RadioClockSettings& settings, bool force)
{ {
qDebug() << "RadioClock::applySettings:" qDebug() << "RadioClock::applySettings:"

4
plugins/channelrx/radioclock/radioclock.h
View File

@ -26,7 +26,6 @@
#include <QDateTime> #include <QDateTime>
#include "dsp/basebandsamplesink.h" #include "dsp/basebandsamplesink.h"
#include "dsp/scopevis.h"
#include "channel/channelapi.h" #include "channel/channelapi.h"
#include "util/message.h" #include "util/message.h"
@ -158,7 +157,7 @@ public:
const QStringList& channelSettingsKeys, const QStringList& channelSettingsKeys,
SWGSDRangel::SWGChannelSettings& response); SWGSDRangel::SWGChannelSettings& response);
ScopeVis *getScopeSink() { return &m_scopeSink; } ScopeVis *getScopeSink();
double getMagSq() const { return m_basebandSink->getMagSq(); } double getMagSq() const { return m_basebandSink->getMagSq(); }
void getMagSqLevels(double& avg, double& peak, int& nbSamples) { void getMagSqLevels(double& avg, double& peak, int& nbSamples) {
@ -178,7 +177,6 @@ private:
int m_basebandSampleRate; //!< stored from device message used when starting baseband sink int m_basebandSampleRate; //!< stored from device message used when starting baseband sink
qint64 m_centerFrequency; qint64 m_centerFrequency;
QDateTime m_dateTime; //!< Received data and time QDateTime m_dateTime; //!< Received data and time
ScopeVis m_scopeSink;
QNetworkAccessManager *m_networkManager; QNetworkAccessManager *m_networkManager;
QNetworkRequest m_networkRequest; QNetworkRequest m_networkRequest;

1
plugins/channelrx/radioclock/radioclockbaseband.cpp
View File

@ -34,6 +34,7 @@ RadioClockBaseband::RadioClockBaseband(RadioClock *radioClock) :
{ {
qDebug("RadioClockBaseband::RadioClockBaseband"); qDebug("RadioClockBaseband::RadioClockBaseband");
m_sink.setScopeSink(&m_scopeSink);
m_sampleFifo.setSize(SampleSinkFifo::getSizePolicy(48000)); m_sampleFifo.setSize(SampleSinkFifo::getSizePolicy(48000));
m_channelizer = new DownChannelizer(&m_sink); m_channelizer = new DownChannelizer(&m_sink);
} }

4
plugins/channelrx/radioclock/radioclockbaseband.h
View File

@ -23,6 +23,7 @@
#include <QMutex> #include <QMutex>
#include "dsp/samplesinkfifo.h" #include "dsp/samplesinkfifo.h"
#include "dsp/scopevis.h"
#include "util/message.h" #include "util/message.h"
#include "util/messagequeue.h" #include "util/messagequeue.h"
@ -72,7 +73,7 @@ public:
} }
void setMessageQueueToChannel(MessageQueue *messageQueue) { m_sink.setMessageQueueToChannel(messageQueue); } void setMessageQueueToChannel(MessageQueue *messageQueue) { m_sink.setMessageQueueToChannel(messageQueue); }
void setBasebandSampleRate(int sampleRate); void setBasebandSampleRate(int sampleRate);
void setScopeSink(ScopeVis *scopeSink) { m_sink.setScopeSink(scopeSink); } ScopeVis *getScopeSink() { return &m_scopeSink; }
void setChannel(ChannelAPI *channel); void setChannel(ChannelAPI *channel);
double getMagSq() const { return m_sink.getMagSq(); } double getMagSq() const { return m_sink.getMagSq(); }
bool isRunning() const { return m_running; } bool isRunning() const { return m_running; }
@ -83,6 +84,7 @@ private:
RadioClockSink m_sink; RadioClockSink m_sink;
MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication
RadioClockSettings m_settings; RadioClockSettings m_settings;
ScopeVis m_scopeSink;
bool m_running; bool m_running;
QMutex m_mutex; QMutex m_mutex;