VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-02 06:04:39 -04:00
Code Issues Projects Releases Wiki Activity

Map: Add Spy Server and Kiwi SDR. Add weather and satellite overlays.

Browse Source
This commit is contained in:
srcejon
2024-02-27 15:40:06 +00:00
parent c9b7ffa3c2
commit e0839fce82
43 changed files with 3348 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/feature/map/map.cpp
+21 -154
View File
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////////
// Copyright (C) 2021-2023 Jon Beniston, M7RCE <jon@beniston.com> //
// Copyright (C) 2021-2024 Jon Beniston, M7RCE <jon@beniston.com> //
// Copyright (C) 2021-2023 Edouard Griffiths, F4EXB <f4exb06@gmail.com> //
// Copyright (C) 2022 Jiří Pinkava <jiri.pinkava@rossum.ai> //
// //
@@ -47,6 +47,7 @@ const char* const Map::m_featureId = "Map";
Map::Map(WebAPIAdapterInterface *webAPIAdapterInterface) :
Feature(m_featureIdURI, webAPIAdapterInterface),
m_availableChannelOrFeatureHandler(MapSettings::m_pipeURIs, QStringList{"mapitems"}),
m_multiplier(0.0)
{
qDebug("Map::Map: webAPIAdapterInterface: %p", webAPIAdapterInterface);
@@ -61,33 +62,33 @@ Map::Map(WebAPIAdapterInterface *webAPIAdapterInterface) :
&Map::networkManagerFinished
);
QObject::connect(
MainCore::instance(),
&MainCore::featureAdded,
&m_availableChannelOrFeatureHandler,
&AvailableChannelOrFeatureHandler::channelsOrFeaturesChanged,
this,
&Map::handleFeatureAdded
&Map::channelsOrFeaturesChanged
);
QObject::connect(
MainCore::instance(),
&MainCore::channelAdded,
&m_availableChannelOrFeatureHandler,
&AvailableChannelOrFeatureHandler::messageEnqueued,
this,
&Map::handleChannelAdded
&Map::handlePipeMessageQueue
);
QTimer::singleShot(2000, this, SLOT(scanAvailableChannelsAndFeatures()));
m_availableChannelOrFeatureHandler.scanAvailableChannelsAndFeatures();
}
Map::~Map()
{
QObject::disconnect(
MainCore::instance(),
&MainCore::featureAdded,
&m_availableChannelOrFeatureHandler,
&AvailableChannelOrFeatureHandler::channelsOrFeaturesChanged,
this,
&Map::handleFeatureAdded
&Map::channelsOrFeaturesChanged
);
QObject::disconnect(
MainCore::instance(),
&MainCore::channelAdded,
&m_availableChannelOrFeatureHandler,
&AvailableChannelOrFeatureHandler::messageEnqueued,
this,
&Map::handleChannelAdded
&Map::handlePipeMessageQueue
);
QObject::disconnect(
m_networkManager,
@@ -435,156 +436,22 @@ QDateTime Map::getMapDateTime()
}
}
void Map::scanAvailableChannelsAndFeatures()
void Map::channelsOrFeaturesChanged(const QStringList& renameFrom, const QStringList& renameTo)
{
qDebug("Map::scanAvailableChannelsAndFeatures");
std::vector<FeatureSet*>& featureSets = MainCore::instance()->getFeatureeSets();
m_availableChannelOrFeatures.clear();
for (const auto& featureSet : featureSets)
{
for (int fei = 0; fei < featureSet->getNumberOfFeatures(); fei++)
{
Feature *feature = featureSet->getFeatureAt(fei);
if (MapSettings::m_pipeURIs.contains(feature->getURI()) && !m_availableChannelOrFeatures.contains(feature))
{
qDebug("Map::scanAvailableChannelsAndFeatures: store feature %d:%d %s (%p)",
featureSet->getIndex(), fei, qPrintable(feature->getURI()), feature);
registerPipe(feature);
MapSettings::AvailableChannelOrFeature availableItem =
MapSettings::AvailableChannelOrFeature{
"F",
featureSet->getIndex(),
fei,
feature->getIdentifier(),
feature
};
m_availableChannelOrFeatures[feature] = availableItem;
}
}
}
std::vector<DeviceSet*>& deviceSets = MainCore::instance()->getDeviceSets();
for (const auto& deviceSet : deviceSets)
{
DSPDeviceSourceEngine *deviceSourceEngine = deviceSet->m_deviceSourceEngine;
DSPDeviceMIMOEngine *deviceMimoEngine = deviceSet->m_deviceMIMOEngine;
if ((deviceSourceEngine) || (deviceMimoEngine))
{
for (int chi = 0; chi < deviceSet->getNumberOfChannels(); chi++)
{
ChannelAPI *channel = deviceSet->getChannelAt(chi);
if (MapSettings::m_pipeURIs.contains(channel->getURI()) && !m_availableChannelOrFeatures.contains(channel))
{
qDebug("Map::scanAvailableChannelsAndFeatures: store channel %d:%d %s (%p)",
deviceSet->getIndex(), chi, qPrintable(channel->getURI()), channel);
registerPipe(channel);
MapSettings::AvailableChannelOrFeature availableItem =
MapSettings::AvailableChannelOrFeature{
"R",
deviceSet->getIndex(),
chi,
channel->getIdentifier(),
channel};
m_availableChannelOrFeatures[channel] = availableItem;
}
}
}
}
notifyUpdate();
m_availableChannelOrFeatures = m_availableChannelOrFeatureHandler.getAvailableChannelOrFeatureList();
notifyUpdate(renameFrom, renameTo);
}
void Map::handleFeatureAdded(int featureSetIndex, Feature *feature)
{
FeatureSet *featureSet = MainCore::instance()->getFeatureeSets()[featureSetIndex];
if (MapSettings::m_pipeURIs.contains(feature->getURI()))
{
qDebug("Map::handleFeatureAdded: featureSetIndex: %d:%d feature: %s (%p)",
featureSetIndex, feature->getIndexInFeatureSet(), qPrintable(feature->getURI()), feature);
registerPipe(feature);
MapSettings::AvailableChannelOrFeature availableItem =
MapSettings::AvailableChannelOrFeature{
"F",
featureSet->getIndex(),
feature->getIndexInFeatureSet(),
feature->getIdentifier(),
feature
};
m_availableChannelOrFeatures[feature] = availableItem;
notifyUpdate();
}
}
void Map::handleChannelAdded(int deviceSetIndex, ChannelAPI *channel)
{
DeviceSet *deviceSet = MainCore::instance()->getDeviceSets()[deviceSetIndex];
DSPDeviceSourceEngine *deviceSourceEngine = deviceSet->m_deviceSourceEngine;
if (deviceSourceEngine && MapSettings::m_pipeURIs.contains(channel->getURI()))
{
qDebug("Map::handleChannelAdded: deviceSetIndex: %d:%d channel: %s (%p)",
deviceSetIndex, channel->getIndexInDeviceSet(), qPrintable(channel->getURI()), channel);
registerPipe(channel);
MapSettings::AvailableChannelOrFeature availableItem =
MapSettings::AvailableChannelOrFeature{
"R",
deviceSet->getIndex(),
channel->getIndexInDeviceSet(),
channel->getIdentifier(),
channel
};
m_availableChannelOrFeatures[channel] = availableItem;
notifyUpdate();
}
}
void Map::registerPipe(QObject *object)
{
qDebug("Map::registerPipe: register %s (%p)", qPrintable(object->objectName()), object);
MessagePipes& messagePipes = MainCore::instance()->getMessagePipes();
ObjectPipe *pipe = messagePipes.registerProducerToConsumer(object, this, "mapitems");
MessageQueue *messageQueue = qobject_cast<MessageQueue*>(pipe->m_element);
QObject::connect(
messageQueue,
&MessageQueue::messageEnqueued,
this,
[=](){ this->handlePipeMessageQueue(messageQueue); },
Qt::QueuedConnection
);
QObject::connect(
pipe,
&ObjectPipe::toBeDeleted,
this,
&Map::handleMessagePipeToBeDeleted
);
}
void Map::notifyUpdate()
void Map::notifyUpdate(const QStringList& renameFrom, const QStringList& renameTo)
{
if (getMessageQueueToGUI())
{
MsgReportAvailableChannelOrFeatures *msg = MsgReportAvailableChannelOrFeatures::create();
msg->getItems() = m_availableChannelOrFeatures.values();
MsgReportAvailableChannelOrFeatures *msg = MsgReportAvailableChannelOrFeatures::create(renameFrom, renameTo);
msg->getItems() = m_availableChannelOrFeatures;
getMessageQueueToGUI()->push(msg);
}
}
void Map::handleMessagePipeToBeDeleted(int reason, QObject* object)
{
if ((reason == 0) && m_availableChannelOrFeatures.contains(object)) // producer
{
qDebug("Map::handleMessagePipeToBeDeleted: removing channel or feature at (%p)", object);
m_availableChannelOrFeatures.remove(object);
notifyUpdate();
}
}
void Map::handlePipeMessageQueue(MessageQueue* messageQueue)
{
Message* message;