flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-01 05:26:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T345, airspace monitor/context ATIS handling

Browse Source 
* using Qt::QueuedConnection
* use new update functions
This commit is contained in:
Klaus Basan
2018-09-09 23:34:46 +02:00
parent 46c684f04c
commit 111eca61ee
4 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/blackcore/airspacemonitor.cpp
View File

@@ -602,12 +602,16 @@ namespace BlackCore
{
Q_ASSERT(CThreadUtils::isCurrentThreadObjectThread(this));
if (!this->isConnectedAndNotShuttingDown() || callsign.isEmpty()) return;
CPropertyIndexVariantMap vm(CAtcStation::IndexAtis, CVariant::from(atisMessage));
this->updateOnlineStation(callsign, vm);
const int changedAtis = m_atcStationsOnline.updateIfMessageChanged(atisMessage, true);
// receiving an ATIS means station is online, update in bookings
vm.addValue(CAtcStation::IndexIsOnline, true);
this->updateBookedStation(callsign, vm);
m_atcStationsBooked.setOnline(callsign, true);
// signal
if (changedAtis > 0)
{
emit this->changedAtisReceived(callsign);
}
}
void CAirspaceMonitor::onAtisVoiceRoomReceived(const CCallsign &callsign, const QString &url)
@@ -759,7 +763,7 @@ namespace BlackCore
if (airlineIcao.isLoadedFromDb() && !knownAircraftIcao)
{
// we have no valid aircraft ICAO, so we do a fuzzy search among those
CAircraftIcaoCode foundIcao = CAircraftMatcher::searchAmongAirlineAircraft(aircraftIcaoString, airlineIcao, callsign, log);
const CAircraftIcaoCode foundIcao = CAircraftMatcher::searchAmongAirlineAircraft(aircraftIcaoString, airlineIcao, callsign, log);
if (foundIcao.isLoadedFromDb()) { aircraftIcao = foundIcao; }
}
@@ -773,7 +777,7 @@ namespace BlackCore
const CCallsign callsign = aircraft.getCallsign();
Q_ASSERT_X(!callsign.isEmpty(), Q_FUNC_INFO, "Missing callsign");
if (!sApp || sApp->isShuttingDown()) { return false; }
if (!sApp || sApp->isShuttingDown() || !sApp->getWebDataServices()) { return false; }
CSimulatedAircraft newAircraft(aircraft);
newAircraft.setRendered(false); // reset rendering