flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-17 10:55:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes: emit signals at end and check sGui

Browse Source
This commit is contained in:
Klaus Basan
2018-06-27 01:44:29 +02:00
parent b551aaf874
commit 7e8c0cc99d
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/blackgui/components/modelmatcherlogcomponent.cpp
View File

@@ -52,14 +52,20 @@ namespace BlackGui
void CModelMatcherLogComponent::initGui() void CModelMatcherLogComponent::initGui()
{ {
// avoid signal roundtrip
bool c = sGui->getIContextNetwork()->isReverseLookupMessagesEnabled();
ui->cb_LogReverseLookup->setChecked(c);
if (sGui) if (sGui)
{ {
// avoid signal roundtrips
bool c = sGui->getIContextNetwork()->isReverseLookupMessagesEnabled();
if (c != ui->cb_LogReverseLookup->isChecked())
{
ui->cb_LogReverseLookup->setChecked(c);
}
c = sGui->getIContextSimulator()->isMatchingMessagesEnabled(); c = sGui->getIContextSimulator()->isMatchingMessagesEnabled();
ui->cb_LogMatchingMessages->setChecked(c); if (c != ui->cb_LogMatchingMessages->isChecked())
{
ui->cb_LogMatchingMessages->setChecked(c);
}
} }
} }

10
src/blackmisc/simulation/remoteaircraftprovider.cpp
View File

@@ -152,10 +152,7 @@ namespace BlackMisc
void CRemoteAircraftProvider::removeAllAircraft() void CRemoteAircraftProvider::removeAllAircraft()
{ {
for (const CCallsign &cs : this->getAircraftInRangeCallsigns()) const CCallsignSet callsigns = this->getAircraftInRangeCallsigns();
{
emit this->removedAircraft(cs);
}
// locked members // locked members
{ {
@@ -182,6 +179,11 @@ namespace BlackMisc
{ QWriteLocker l(&m_lockPartsHistory); m_aircraftPartsMessages.clear(); } { QWriteLocker l(&m_lockPartsHistory); m_aircraftPartsMessages.clear(); }
{ QWriteLocker l(&m_lockMessages); m_reverseLookupMessages.clear(); } { QWriteLocker l(&m_lockMessages); m_reverseLookupMessages.clear(); }
{ QWriteLocker l(&m_lockAircraft); m_aircraftInRange.clear(); } { QWriteLocker l(&m_lockAircraft); m_aircraftInRange.clear(); }
for (const CCallsign &cs : callsigns)
{
emit this->removedAircraft(cs);
}
} }
void CRemoteAircraftProvider::removeReverseLookupMessages(const CCallsign &callsign) void CRemoteAircraftProvider::removeReverseLookupMessages(const CCallsign &callsign)