VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clear paths when closing.

This commit is contained in:
srcejon 2024-04-04 21:41:32 +01:00
parent 535f5c5e8f
commit 700d17c9cf
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
plugins/feature/sid/sidgui.cpp
View File

@ -306,6 +306,9 @@ SIDGUI::~SIDGUI()
disconnect(m_stix, &STIX::dataUpdated, this, &SIDGUI::stixDataUpdated); disconnect(m_stix, &STIX::dataUpdated, this, &SIDGUI::stixDataUpdated);
} }
m_statusTimer.stop(); m_statusTimer.stop();
clearFromMap();
delete m_goesXRay; delete m_goesXRay;
delete ui; delete ui;
} }
@ -1962,6 +1965,7 @@ void SIDGUI::on_map_currentTextChanged(const QString& text)
// Plot paths from transmitters to receivers on map // Plot paths from transmitters to receivers on map
void SIDGUI::on_showPaths_clicked() void SIDGUI::on_showPaths_clicked()
{ {
clearFromMap();
for (int i = 0; i < m_settings.m_channelSettings.size(); i++) for (int i = 0; i < m_settings.m_channelSettings.size(); i++)
{ {
@ -2041,12 +2045,33 @@ void SIDGUI::on_showPaths_clicked()
MainCore::MsgMapItem *msg = MainCore::MsgMapItem::create(m_sid, swgMapItem); MainCore::MsgMapItem *msg = MainCore::MsgMapItem::create(m_sid, swgMapItem);
messageQueue->push(msg); messageQueue->push(msg);
m_mapItemNames.append(name);
} }
} }
} }
} }
} }
}
void SIDGUI::clearFromMap()
{
QList<ObjectPipe*> mapPipes;
MainCore::instance()->getMessagePipes().getMessagePipes(m_sid, "mapitems", mapPipes);
for (const auto& name : m_mapItemNames)
{
for (const auto& pipe : mapPipes)
{
MessageQueue *messageQueue = qobject_cast<MessageQueue*>(pipe->m_element);
SWGSDRangel::SWGMapItem *swgMapItem = new SWGSDRangel::SWGMapItem();
swgMapItem->setName(new QString(name));
swgMapItem->setImage(new QString(""));
swgMapItem->setType(3);
MainCore::MsgMapItem *msg = MainCore::MsgMapItem::create(m_sid, swgMapItem);
messageQueue->push(msg);
}
}
} }
void SIDGUI::featuresChanged(const QStringList& renameFrom, const QStringList& renameTo) void SIDGUI::featuresChanged(const QStringList& renameFrom, const QStringList& renameTo)

3
plugins/feature/sid/sidgui.h
View File

@ -195,6 +195,8 @@ private:
AvailableChannelOrFeatureHandler m_availableFeatureHandler; AvailableChannelOrFeatureHandler m_availableFeatureHandler;
AvailableChannelOrFeatureHandler m_availableChannelHandler; AvailableChannelOrFeatureHandler m_availableChannelHandler;
QStringList m_mapItemNames;
explicit SIDGUI(PluginAPI* pluginAPI, FeatureUISet *featureUISet, Feature *feature, QWidget* parent = nullptr); explicit SIDGUI(PluginAPI* pluginAPI, FeatureUISet *featureUISet, Feature *feature, QWidget* parent = nullptr);
virtual ~SIDGUI(); virtual ~SIDGUI();
@ -244,6 +246,7 @@ private:
void connectDataUpdates(); void connectDataUpdates();
void disconnectDataUpdates(); void disconnectDataUpdates();
void getData(); void getData();
void clearFromMap();
static qreal pixelDistance(QChart *chart, QAbstractSeries *series, QPointF a, QPointF b); static qreal pixelDistance(QChart *chart, QAbstractSeries *series, QPointF a, QPointF b);