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

style and consistency:

Browse Source 
* rename CStatusMessages to CStatusMessageList
* rename NetworkVatlib to CNetworkVatlib
* replace all occurrences of Realname with RealName (correct camel case)
* CSequence method corresponding to CList::append is push_back
* don't compile the qdbuscpp2xml metadata plugin by default
* CAircraftIcao string members always trimmed and capitalized
* added CComSystem::roundTo25KHz
* using epsilon comparison in a couple of places

refs #81
This commit is contained in:
Klaus Basan
2014-01-07 23:00:39 +00:00
committed by Mathew Sutcliffe
parent b5c3a5543f
commit bb61654a29
80 changed files with 846 additions and 753 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/blackmisc/avatcstationlist.cpp
View File

@@ -69,70 +69,75 @@ namespace BlackMisc
/*
* Merge with booking
*/
int CAtcStationList::mergeWithBooking(CAtcStation &booking)
int CAtcStationList::mergeWithBooking(CAtcStation &bookedAtcStation)
{
int c = 0;
booking.setOnline(false); // reset
bookedAtcStation.setOnline(false); // reset
for (auto i = this->begin(); i != this->end(); ++i)
{
CAtcStation currentOnline = *i;
if (currentOnline.getCallsign() != booking.getCallsign()) continue;
CAtcStation onlineAtcStation = *i;
if (onlineAtcStation.getCallsign() != bookedAtcStation.getCallsign()) continue;
// from online to booking
booking.setOnline(true);
booking.setFrequency(currentOnline.getFrequency());
bookedAtcStation.setOnline(true);
bookedAtcStation.setFrequency(onlineAtcStation.getFrequency());
// Logoff Zulu Time set?
// comes directly from the online controller and is most likely more accurate
if (!onlineAtcStation.getBookedUntilUtc().isNull())
bookedAtcStation.setBookedUntilUtc(onlineAtcStation.getBookedUntilUtc());
// from booking to online
if (!currentOnline.isBookedNow() && booking.hasValidBookingTimes())
if (!onlineAtcStation.isBookedNow() && bookedAtcStation.hasValidBookingTimes())
{
if (currentOnline.hasValidBookingTimes())
if (onlineAtcStation.hasValidBookingTimes())
{
if (booking.isBookedNow())
if (bookedAtcStation.isBookedNow())
{
// can't get any better
currentOnline.setBookedFromUntil(booking);
onlineAtcStation.setBookedFromUntil(bookedAtcStation);
}
else
{
// we already have some booking dates
CTime timeDiffBooking = booking.bookedWhen();
CTime timeDiffOnline = currentOnline.bookedWhen();
CTime timeDiffBooking = bookedAtcStation.bookedWhen();
CTime timeDiffOnline = onlineAtcStation.bookedWhen();
if (timeDiffBooking.isNegativeWithEpsilonConsidered() && timeDiffOnline.isNegativeWithEpsilonConsidered())
{
// both in past
if (timeDiffBooking > timeDiffOnline)
currentOnline.setBookedFromUntil(booking);
onlineAtcStation.setBookedFromUntil(bookedAtcStation);
}
else if (timeDiffBooking.isPositiveWithEpsilonConsidered() && timeDiffOnline.isPositiveWithEpsilonConsidered())
{
// both in future
if (timeDiffBooking < timeDiffOnline)
currentOnline.setBookedFromUntil(booking);
onlineAtcStation.setBookedFromUntil(bookedAtcStation);
}
else if (timeDiffBooking.isPositiveWithEpsilonConsidered() && timeDiffOnline.isNegativeWithEpsilonConsidered())
{
// future booking is better than past booking
currentOnline.setBookedFromUntil(booking);
onlineAtcStation.setBookedFromUntil(bookedAtcStation);
}
}
}
else
{
// no booking info so far
currentOnline.setBookedFromUntil(booking);
onlineAtcStation.setBookedFromUntil(bookedAtcStation);
}
}
// both ways
currentOnline.syncronizeControllerData(booking);
if (currentOnline.hasValidDistance())
booking.setDistanceToPlane(currentOnline.getDistanceToPlane());
else if (booking.hasValidDistance())
currentOnline.setDistanceToPlane(booking.getDistanceToPlane());
onlineAtcStation.syncronizeControllerData(bookedAtcStation);
if (onlineAtcStation.hasValidDistance())
bookedAtcStation.setDistanceToPlane(onlineAtcStation.getDistanceToPlane());
else if (bookedAtcStation.hasValidDistance())
onlineAtcStation.setDistanceToPlane(bookedAtcStation.getDistanceToPlane());
// update
*i = currentOnline;
*i = onlineAtcStation;
c++;
}