flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-02 23:25:53 +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

84
src/blackmisc/aviation/atcstation.cpp
View File

@@ -180,12 +180,88 @@ namespace BlackMisc
void CAtcStation::syncronizeControllerData(CAtcStation &otherStation)
{
if (this->m_controller == otherStation.getController()) return;
if (this->m_controller == otherStation.getController()) { return; }
CUser otherController = otherStation.getController();
this->m_controller.syncronizeData(otherController);
otherStation.setController(otherController);
}
void CAtcStation::syncronizeWithBookedStation(CAtcStation &bookedStation)
{
if (bookedStation.getCallsign() != this->getCallsign()) { return; }
// from online to booking
bookedStation.setOnline(true);
bookedStation.setFrequency(this->getFrequency());
// Logoff Zulu Time set?
// comes directly from the online controller and is most likely more accurate
if (!this->getBookedUntilUtc().isNull())
{
bookedStation.setBookedUntilUtc(this->getBookedUntilUtc());
}
// from booking to online
// booked now stations have valid data and need no update
if (!this->isBookedNow() && bookedStation.hasValidBookingTimes())
{
if (this->hasValidBookingTimes())
{
if (bookedStation.isBookedNow())
{
// can't get any better, we just copy from / to over
this->setBookedFromUntil(bookedStation);
}
else
{
// we already have some booking dates, we will verify those now
// and will set the most appropriate booking dates
CTime timeDiffBooking(bookedStation.bookedWhen());
CTime timeDiffOnline(this->bookedWhen()); // diff to now
if (timeDiffBooking.isNegativeWithEpsilonConsidered() && timeDiffOnline.isNegativeWithEpsilonConsidered())
{
// both in past
if (timeDiffBooking > timeDiffOnline)
{
this->setBookedFromUntil(bookedStation);
}
}
else if (timeDiffBooking.isPositiveWithEpsilonConsidered() && timeDiffOnline.isPositiveWithEpsilonConsidered())
{
// both in future
if (timeDiffBooking < timeDiffOnline)
{
this->setBookedFromUntil(bookedStation);
}
}
else if (timeDiffBooking.isPositiveWithEpsilonConsidered() && timeDiffOnline.isNegativeWithEpsilonConsidered())
{
// future booking is better than past booking
this->setBookedFromUntil(bookedStation);
}
}
}
else
{
// no booking info so far, so we just copy over
this->setBookedFromUntil(bookedStation);
}
}
// both ways
this->syncronizeControllerData(bookedStation);
if (this->hasValidDistance())
{
bookedStation.setDistanceToOwnAircraft(this->getDistanceToOwnAircraft());
bookedStation.setBearingToOwnAircraft(this->getBearingToOwnAircraft());
}
else if (bookedStation.hasValidDistance())
{
this->setDistanceToOwnAircraft(bookedStation.getDistanceToOwnAircraft());
this->setBearingToOwnAircraft(bookedStation.getBearingToOwnAircraft());
}
}
bool CAtcStation::isInRange() const
{
if (m_range.isNull() || !hasValidDistance()) { return false; }
@@ -206,10 +282,10 @@ namespace BlackMisc
bool CAtcStation::isBookedNow() const
{
if (!this->hasValidBookingTimes()) return false;
if (!this->hasValidBookingTimes()) { return false; }
QDateTime now = QDateTime::currentDateTimeUtc();
if (this->m_bookedFromUtc > now) return false;
if (now > this->m_bookedUntilUtc) return false;
if (this->m_bookedFromUtc > now) { return false; }
if (now > this->m_bookedUntilUtc) { return false; }
return true;
}