VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-03-27 22:59:28 -04:00
Code Issues Projects Releases Wiki Activity

Message pipes rework: settings pipes change in AFC, SSB demod, Frequency tracker

Browse Source
This commit is contained in:
f4exb 2022-03-02 06:58:54 +01:00
parent 1c5a777709
commit 283ab64c59
6 changed files with 88 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
plugins/channelrx/demodssb/ssbdemod.cpp
View File

@ -270,10 +270,11 @@ void SSBDemod::applySettings(const SSBDemodSettings& settings, bool force)
webapiReverseSendSettings(reverseAPIKeys, settings, fullUpdate || force); webapiReverseSendSettings(reverseAPIKeys, settings, fullUpdate || force);
} }
QList<MessageQueue*> *messageQueues = MainCore::instance()->getMessagePipes().getMessageQueues(this, "settings"); QList<ObjectPipe*> pipes;
MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes);
if (messageQueues) { if (pipes.size() > 0) {
sendChannelSettings(messageQueues, reverseAPIKeys, settings, force); sendChannelSettings(pipes, reverseAPIKeys, settings, force);
} }
m_settings = settings; m_settings = settings;
@ -581,24 +582,29 @@ void SSBDemod::webapiReverseSendSettings(QList<QString>& channelSettingsKeys, co
} }
void SSBDemod::sendChannelSettings( void SSBDemod::sendChannelSettings(
QList<MessageQueue*> *messageQueues, const QList<ObjectPipe*>& pipes,
QList<QString>& channelSettingsKeys, QList<QString>& channelSettingsKeys,
const SSBDemodSettings& settings, const SSBDemodSettings& settings,
bool force) bool force)
{ {
QList<MessageQueue*>::iterator it = messageQueues->begin(); qDebug("SSBDemod::sendChannelSettings: %d pipes", pipes.size());
for (; it != messageQueues->end(); ++it) for (const auto& pipe : pipes)
{ {
SWGSDRangel::SWGChannelSettings *swgChannelSettings = new SWGSDRangel::SWGChannelSettings(); MessageQueue *messageQueue = qobject_cast<MessageQueue*>(pipe->m_element);
webapiFormatChannelSettings(channelSettingsKeys, swgChannelSettings, settings, force);
MainCore::MsgChannelSettings *msg = MainCore::MsgChannelSettings::create( if (messageQueue)
this, {
channelSettingsKeys, SWGSDRangel::SWGChannelSettings *swgChannelSettings = new SWGSDRangel::SWGChannelSettings();
swgChannelSettings, webapiFormatChannelSettings(channelSettingsKeys, swgChannelSettings, settings, force);
force MainCore::MsgChannelSettings *msg = MainCore::MsgChannelSettings::create(
); this,
(*it)->push(msg); channelSettingsKeys,
swgChannelSettings,
force
);
messageQueue->push(msg);
}
} }
} }

3
plugins/channelrx/demodssb/ssbdemod.h
View File

@ -36,6 +36,7 @@ class QNetworkAccessManager;
class QNetworkReply; class QNetworkReply;
class QThread; class QThread;
class DeviceAPI; class DeviceAPI;
class ObjectPipe;
class SSBDemod : public BasebandSampleSink, public ChannelAPI { class SSBDemod : public BasebandSampleSink, public ChannelAPI {
public: public:
@ -148,7 +149,7 @@ private:
void webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response); void webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response);
void webapiReverseSendSettings(QList<QString>& channelSettingsKeys, const SSBDemodSettings& settings, bool force); void webapiReverseSendSettings(QList<QString>& channelSettingsKeys, const SSBDemodSettings& settings, bool force);
void sendChannelSettings( void sendChannelSettings(
QList<MessageQueue*> *messageQueues, const QList<ObjectPipe*>& pipes,
QList<QString>& channelSettingsKeys, QList<QString>& channelSettingsKeys,
const SSBDemodSettings& settings, const SSBDemodSettings& settings,
bool force bool force

36
plugins/channelrx/freqtracker/freqtracker.cpp
View File

@ -274,10 +274,11 @@ void FreqTracker::applySettings(const FreqTrackerSettings& settings, bool force)
webapiReverseSendSettings(reverseAPIKeys, settings, fullUpdate || force); webapiReverseSendSettings(reverseAPIKeys, settings, fullUpdate || force);
} }
QList<MessageQueue*> *messageQueues = MainCore::instance()->getMessagePipes().getMessageQueues(this, "settings"); QList<ObjectPipe*> pipes;
MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes);
if (messageQueues) { if (pipes.size() > 0) {
sendChannelSettings(messageQueues, reverseAPIKeys, settings, force); sendChannelSettings(pipes, reverseAPIKeys, settings, force);
} }
m_settings = settings; m_settings = settings;
@ -551,24 +552,27 @@ void FreqTracker::webapiReverseSendSettings(QList<QString>& channelSettingsKeys,
} }
void FreqTracker::sendChannelSettings( void FreqTracker::sendChannelSettings(
QList<MessageQueue*> *messageQueues, const QList<ObjectPipe*>& pipes,
QList<QString>& channelSettingsKeys, QList<QString>& channelSettingsKeys,
const FreqTrackerSettings& settings, const FreqTrackerSettings& settings,
bool force) bool force)
{ {
QList<MessageQueue*>::iterator it = messageQueues->begin(); for (const auto& pipe : pipes)
for (; it != messageQueues->end(); ++it)
{ {
SWGSDRangel::SWGChannelSettings *swgChannelSettings = new SWGSDRangel::SWGChannelSettings(); MessageQueue *messageQueue = qobject_cast<MessageQueue*>(pipe->m_element);
webapiFormatChannelSettings(channelSettingsKeys, swgChannelSettings, settings, force);
MainCore::MsgChannelSettings *msg = MainCore::MsgChannelSettings::create( if (messageQueue)
this, {
channelSettingsKeys, SWGSDRangel::SWGChannelSettings *swgChannelSettings = new SWGSDRangel::SWGChannelSettings();
swgChannelSettings, webapiFormatChannelSettings(channelSettingsKeys, swgChannelSettings, settings, force);
force MainCore::MsgChannelSettings *msg = MainCore::MsgChannelSettings::create(
); this,
(*it)->push(msg); channelSettingsKeys,
swgChannelSettings,
force
);
messageQueue->push(msg);
}
} }
} }

3
plugins/channelrx/freqtracker/freqtracker.h
View File

@ -33,6 +33,7 @@
class QNetworkAccessManager; class QNetworkAccessManager;
class QNetworkReply; class QNetworkReply;
class DeviceAPI; class DeviceAPI;
class ObjectPipe;
class FreqTracker : public BasebandSampleSink, public ChannelAPI { class FreqTracker : public BasebandSampleSink, public ChannelAPI {
public: public:
@ -145,7 +146,7 @@ private:
void webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response); void webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response);
void webapiReverseSendSettings(QList<QString>& channelSettingsKeys, const FreqTrackerSettings& settings, bool force); void webapiReverseSendSettings(QList<QString>& channelSettingsKeys, const FreqTrackerSettings& settings, bool force);
void sendChannelSettings( void sendChannelSettings(
QList<MessageQueue*> *messageQueues, const QList<ObjectPipe*>& pipes,
QList<QString>& channelSettingsKeys, QList<QString>& channelSettingsKeys,
const FreqTrackerSettings& settings, const FreqTrackerSettings& settings,
bool force bool force

52
plugins/feature/afc/afc.cpp
View File

@ -630,6 +630,7 @@ void AFC::trackerDeviceChange(int deviceIndex)
MainCore *mainCore = MainCore::instance(); MainCore *mainCore = MainCore::instance();
m_trackerDeviceSet = mainCore->getDeviceSets()[deviceIndex]; m_trackerDeviceSet = mainCore->getDeviceSets()[deviceIndex];
m_trackerChannelAPI = nullptr;
for (int i = 0; i < m_trackerDeviceSet->getNumberOfChannels(); i++) for (int i = 0; i < m_trackerDeviceSet->getNumberOfChannels(); i++)
{ {
@ -651,12 +652,22 @@ void AFC::trackerDeviceChange(int deviceIndex)
); );
} }
connect(pipe, SIGNAL(toBeDeleted(int, QObject*)), this, SLOT(handleTrackerMessagePipeToBeDeleted(int, QObject*)));
m_trackerChannelAPI = channel; m_trackerChannelAPI = channel;
break; break;
} }
} }
} }
void AFC::handleTrackerMessagePipeToBeDeleted(int reason, QObject* object)
{
if ((reason == 0) && ((ChannelAPI*) object == m_trackerChannelAPI)) // tracker channel has been de;eted
{
m_trackerChannelAPI = nullptr;
updateDeviceSetLists();
}
}
void AFC::trackedDeviceChange(int deviceIndex) void AFC::trackedDeviceChange(int deviceIndex)
{ {
qDebug("AFC::trackedDeviceChange: deviceIndex: %d", deviceIndex); qDebug("AFC::trackedDeviceChange: deviceIndex: %d", deviceIndex);
@ -667,6 +678,8 @@ void AFC::trackedDeviceChange(int deviceIndex)
MainCore *mainCore = MainCore::instance(); MainCore *mainCore = MainCore::instance();
m_trackedDeviceSet = mainCore->getDeviceSets()[deviceIndex]; m_trackedDeviceSet = mainCore->getDeviceSets()[deviceIndex];
m_trackerIndexInDeviceSet = -1;
m_trackedChannelAPIs.clear();
for (int i = 0; i < m_trackedDeviceSet->getNumberOfChannels(); i++) for (int i = 0; i < m_trackedDeviceSet->getNumberOfChannels(); i++)
{ {
@ -688,41 +701,58 @@ void AFC::trackedDeviceChange(int deviceIndex)
); );
m_trackerIndexInDeviceSet = i; m_trackerIndexInDeviceSet = i;
} }
m_trackedChannelAPIs.push_back(channel);
connect(pipe, SIGNAL(toBeDeleted(int, QObject*)), this, SLOT(handleTrackedMessagePipeToBeDeleted(int, QObject*)));
} }
} }
} }
void AFC::handleTrackedMessagePipeToBeDeleted(int reason, QObject* object)
{
if ((reason == 0) && m_trackedChannelAPIs.contains((ChannelAPI*) object))
{
m_trackedChannelAPIs.removeAll((ChannelAPI*) object);
updateDeviceSetLists();
}
}
void AFC::removeTrackerFeatureReference() void AFC::removeTrackerFeatureReference()
{ {
if (m_trackerChannelAPI) if (m_trackerChannelAPI)
{ {
if (MainCore::instance()->existsChannel(m_trackerChannelAPI)) ObjectPipe *pipe = MainCore::instance()->getMessagePipes2().unregisterProducerToConsumer(m_trackerChannelAPI, this, "settings");
if (pipe)
{ {
qDebug("AFC::removeTrackerFeatureReference: m_trackerChannelAPI: %s", qPrintable(m_trackerChannelAPI->objectName()));
ObjectPipe *pipe = MainCore::instance()->getMessagePipes2().unregisterProducerToConsumer(m_trackerChannelAPI, this, "settings");
MessageQueue *messageQueue = qobject_cast<MessageQueue*>(pipe->m_element); MessageQueue *messageQueue = qobject_cast<MessageQueue*>(pipe->m_element);
if (messageQueue) { if (messageQueue) {
disconnect(messageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleChannelMessageQueue(MessageQueue*))); disconnect(messageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleChannelMessageQueue(MessageQueue*)));
} }
} }
m_trackerChannelAPI = nullptr;
} }
} }
void AFC::removeTrackedFeatureReferences() void AFC::removeTrackedFeatureReferences()
{ {
for (QList<ChannelAPI*>::iterator it = m_trackedChannelAPIs.begin(); it != m_trackedChannelAPIs.end(); ++it) for (auto& channel : m_trackedChannelAPIs)
{ {
ChannelAPI *channel = *it; ObjectPipe *pipe = MainCore::instance()->getMessagePipes2().unregisterProducerToConsumer(channel, this, "settings");
if (MainCore::instance()->existsChannel(channel)) if (pipe)
{ {
qDebug("AFC::removeTrackedFeatureReferences: channel: %s", qPrintable(channel->objectName())); MessageQueue *messageQueue = qobject_cast<MessageQueue*>(pipe->m_element);
MainCore::instance()->getMessagePipes2().unregisterProducerToConsumer(channel, this, "settings");
}
}
m_trackedChannelAPIs.clear(); if (messageQueue) {
disconnect(messageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleChannelMessageQueue(MessageQueue*)));
}
}
m_trackedChannelAPIs.removeAll(channel);
}
} }
void AFC::handleChannelMessageQueue(MessageQueue* messageQueue) void AFC::handleChannelMessageQueue(MessageQueue* messageQueue)

2
plugins/feature/afc/afc.h
View File

@ -226,6 +226,8 @@ private:
private slots: private slots:
void networkManagerFinished(QNetworkReply *reply); void networkManagerFinished(QNetworkReply *reply);
void handleChannelMessageQueue(MessageQueue* messageQueue); void handleChannelMessageQueue(MessageQueue* messageQueue);
void handleTrackerMessagePipeToBeDeleted(int reason, QObject* object);
void handleTrackedMessagePipeToBeDeleted(int reason, QObject* object);
}; };
#endif // INCLUDE_FEATURE_AFC_H_ #endif // INCLUDE_FEATURE_AFC_H_