flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-07 02:35:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #459 Removed CAircraftParts::m_correspondingCallsign per Slack discussion MS/RW.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2015-09-07 17:29:23 +01:00
parent d1955ba61f
commit 00cd4f4f87
24 changed files with 52 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/blackcore/airspace_monitor.cpp
View File

@@ -140,7 +140,7 @@ namespace BlackCore
QList<QMetaObject::Connection> CAirspaceMonitor::connectRemoteAircraftProviderSignals(
QObject *receiver,
std::function<void(const CAircraftSituation &)> situationSlot,
std::function<void(const CAircraftParts &)> partsSlot,
std::function<void(const BlackMisc::Aviation::CCallsign &, const CAircraftParts &)> partsSlot,
std::function<void(const CCallsign &)> removedAircraftSlot,
std::function<void(const CAirspaceAircraftSnapshot &)> aircraftSnapshotSlot
)
@@ -373,9 +373,9 @@ namespace BlackCore
emit this->changedAtcStationsOnline();
}
void CAirspaceMonitor::testAddAircraftParts(const CAircraftParts &parts, bool incremental)
void CAirspaceMonitor::testAddAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, const CAircraftParts &parts, bool incremental)
{
this->ps_aircraftConfigReceived(parts.getCallsign(), parts.toJson(), !incremental);
this->ps_aircraftConfigReceived(callsign, parts.toJson(), !incremental);
}
void CAirspaceMonitor::clear()
@@ -1011,18 +1011,17 @@ namespace BlackCore
else
{
// incremental update
parts = this->remoteAircraftParts(callsign).findFirstByCallsign(callsign);
parts = this->remoteAircraftParts(callsign).frontOrDefault();
QJsonObject config = applyIncrementalObject(parts.toJson(), jsonObject);
parts.convertFromJson(config);
}
// make sure in any case right time / callsign
// make sure in any case right time
parts.setCurrentUtcTime();
parts.setCallsign(callsign);
// store part history (parts always absolute)
this->storeAircraftParts(parts);
emit this->addedAircraftParts(parts);
this->storeAircraftParts(callsign, parts);
emit this->addedAircraftParts(callsign, parts);
// here I expect always a changed value
QWriteLocker l(&m_lockAircraft);
@@ -1052,10 +1051,8 @@ namespace BlackCore
Q_ASSERT_X(l.size() < 2 || l[0].getMSecsSinceEpoch() >= l[1].getMSecsSinceEpoch(), Q_FUNC_INFO, "wrong sort order");
}
void CAirspaceMonitor::storeAircraftParts(const CAircraftParts &parts)
void CAirspaceMonitor::storeAircraftParts(const CCallsign &callsign, const CAircraftParts &parts)
{
const CCallsign callsign(parts.getCallsign());
Q_ASSERT_X(!callsign.isEmpty(), "storeAircraftParts", "empty callsign");
if (callsign.isEmpty()) { return; }
// list sorted from new to old