From 4b321a847f6f415e107ce64cf86a13a413080881 Mon Sep 17 00:00:00 2001 From: f4exb Date: Thu, 26 May 2022 11:54:25 +0200 Subject: [PATCH] Fixed Interferometer and BeamSteeringCW MIMO channel plugins --- plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.cpp | 1 - plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.h | 2 -- plugins/channelmimo/interferometer/interferometer.cpp | 2 +- plugins/channelmimo/interferometer/interferometer.h | 2 -- 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.cpp b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.cpp index 2915538d2..12fff4c86 100644 --- a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.cpp +++ b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.cpp @@ -54,7 +54,6 @@ BeamSteeringCWMod::BeamSteeringCWMod(DeviceAPI *deviceAPI) : m_basebandSource->moveToThread(m_thread); m_deviceAPI->addMIMOChannel(this); m_deviceAPI->addMIMOChannelAPI(this); - connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages())); m_networkManager = new QNetworkAccessManager(); QObject::connect( diff --git a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.h b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.h index 90979c5c0..19833e1f7 100644 --- a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.h +++ b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.h @@ -120,7 +120,6 @@ public: return m_frequencyOffset; } - MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } //!< Get the queue for asynchronous inbound communication virtual void setMessageQueueToGUI(MessageQueue *queue) { m_guiMessageQueue = queue; } MessageQueue *getMessageQueueToGUI() { return m_guiMessageQueue; } @@ -158,7 +157,6 @@ private: BasebandSampleSink* m_spectrumSink; BasebandSampleSink* m_scopeSink; BeamSteeringCWModSettings m_settings; - MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication MessageQueue *m_guiMessageQueue; //!< Input message queue to the GUI QNetworkAccessManager *m_networkManager; diff --git a/plugins/channelmimo/interferometer/interferometer.cpp b/plugins/channelmimo/interferometer/interferometer.cpp index 82b1ca41a..55bac2187 100644 --- a/plugins/channelmimo/interferometer/interferometer.cpp +++ b/plugins/channelmimo/interferometer/interferometer.cpp @@ -53,10 +53,10 @@ Interferometer::Interferometer(DeviceAPI *deviceAPI) : m_thread = new QThread(this); m_basebandSink = new InterferometerBaseband(m_fftSize); m_basebandSink->setSpectrumSink(&m_spectrumVis); + m_basebandSink->setScopeSink(&m_scopeSink); m_basebandSink->moveToThread(m_thread); m_deviceAPI->addMIMOChannel(this); m_deviceAPI->addMIMOChannelAPI(this); - connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages())); m_networkManager = new QNetworkAccessManager(); QObject::connect( diff --git a/plugins/channelmimo/interferometer/interferometer.h b/plugins/channelmimo/interferometer/interferometer.h index a6444f397..cb2a213cd 100644 --- a/plugins/channelmimo/interferometer/interferometer.h +++ b/plugins/channelmimo/interferometer/interferometer.h @@ -120,7 +120,6 @@ public: return m_frequencyOffset; } - MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } //!< Get the queue for asynchronous inbound communication virtual void setMessageQueueToGUI(MessageQueue *queue) { m_guiMessageQueue = queue; } MessageQueue *getMessageQueueToGUI() { return m_guiMessageQueue; } @@ -162,7 +161,6 @@ private: ScopeVis m_scopeSink; InterferometerBaseband* m_basebandSink; InterferometerSettings m_settings; - MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication MessageQueue *m_guiMessageQueue; //!< Input message queue to the GUI QNetworkAccessManager *m_networkManager;