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

refs #395, improved synchronization of booked and online stations

Browse Source 
* moved sync functionality into CAtcStation
* consolidated function names
This commit is contained in:
Klaus Basan
2015-04-22 23:50:28 +02:00
committed by Mathew Sutcliffe
parent f7158f17f9
commit 79e2a7b805
8 changed files with 161 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/blackcore/airspace_monitor.cpp
View File

@@ -30,7 +30,7 @@ namespace BlackCore
: QObject(parent),
COwnAircraftAwareReadOnly(ownAircraftProvider),
m_network(network), m_vatsimBookingReader(bookings), m_vatsimDataFileReader(dataFile),
m_analyzer(new CAirspaceAnalyzer(network, this))
m_analyzer(new CAirspaceAnalyzer(ownAircraftProvider, this, network, this))
{
this->connect(this->m_network, &INetwork::atcPositionUpdate, this, &CAirspaceMonitor::ps_atcPositionUpdate);
this->connect(this->m_network, &INetwork::atisReplyReceived, this, &CAirspaceMonitor::ps_atisReceived);
@@ -549,15 +549,19 @@ namespace BlackCore
void CAirspaceMonitor::ps_receivedBookings(const CAtcStationList &bookedStations)
{
Q_ASSERT(BlackCore::isCurrentThreadCreatingThread(this));
this->m_atcStationsBooked.clear();
foreach(CAtcStation bookedStation, bookedStations)
if (bookedStations.isEmpty())
{
// complete by VATSIM data file data
this->m_vatsimDataFileReader->getAtcStations().updateFromVatsimDataFileStation(bookedStation);
// exchange booking and online data, both sides are updated
this->m_atcStationsOnline.mergeWithBooking(bookedStation);
// into list
this->m_atcStationsBooked.push_back(bookedStation);
this->m_atcStationsBooked.clear();
}
else
{
CAtcStationList newBookedStations(bookedStations); // modifyable copy
for (CAtcStation &bookedStation : newBookedStations)
{
// exchange booking and online data, both sides are updated
this->m_atcStationsOnline.syncronizeWithBookedStation(bookedStation);
}
this->m_atcStationsBooked = newBookedStations;
}
emit this->changedAtcStationsBooked(); // all booked stations reloaded
}
@@ -614,17 +618,26 @@ namespace BlackCore
CAtcStationList stationsWithCallsign = this->m_atcStationsOnline.findByCallsign(callsign);
if (stationsWithCallsign.isEmpty())
{
// new station
CAtcStation station;
// new station, init with data from data file
CAtcStation station(this->m_vatsimDataFileReader->getAtcStationsForCallsign(callsign).frontOrDefault());
station.setCallsign(callsign);
station.setRange(range);
station.setFrequency(frequency);
station.setPosition(position);
station.setOnline(true);
station.calculcateDistanceAndBearingToOwnAircraft(ownAircraft().getPosition());
this->m_vatsimDataFileReader->getAtcStations().updateFromVatsimDataFileStation(station); // prefill
// sync with bookings
if (this->m_atcStationsBooked.containsCallsign(callsign))
{
CAtcStation bookedStation(this->m_atcStationsBooked.findFirstByCallsign(callsign));
station.syncronizeWithBookedStation(bookedStation);
this->m_atcStationsBooked.replaceIf(&CAtcStation::getCallsign, callsign, bookedStation);
}
this->m_atcStationsOnline.push_back(station);
// subsequent queries
if (this->m_network->isConnected())
{
emit this->m_network->sendRealNameQuery(callsign);
@@ -633,7 +646,7 @@ namespace BlackCore
}
emit this->changedAtcStationsOnline();
// Remark: this->changedAtcStationOnlineConnectionStatus(station, true);
// Remark: this->changedAtcStationOnlineConnectionStatus
// will be sent in psFsdAtisVoiceRoomReceived
}
else