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

ATC stations, style and minor fixes

Browse Source
This commit is contained in:
Klaus Basan
2019-12-27 23:19:09 +01:00
committed by Mat Sutcliffe
parent d29dec81d7
commit 524a9b3793
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/blackcore/airspacemonitor.cpp
View File

@@ -470,13 +470,16 @@ namespace BlackCore
void CAirspaceMonitor::onRealNameReplyReceived(const CCallsign &callsign, const QString &realname) void CAirspaceMonitor::onRealNameReplyReceived(const CCallsign &callsign, const QString &realname)
{ {
if (!this->isConnectedAndNotShuttingDown() || realname.isEmpty()) { return; } if (!this->isConnectedAndNotShuttingDown() || realname.isEmpty()) { return; }
int wasAtc = false; if (!sApp || sApp->isShuttingDown() || !sApp->getWebDataServices()) { return; }
bool wasAtc = false;
const QString rn = CUser::beautifyRealName(realname);
if (callsign.hasSuffix()) if (callsign.hasSuffix())
{ {
// very likely and ATC callsign // very likely and ATC callsign
const CPropertyIndexVariantMap vm = CPropertyIndexVariantMap({ CAtcStation::IndexController, CUser::IndexRealName }, realname); const CPropertyIndexVariantMap vm = CPropertyIndexVariantMap({ CAtcStation::IndexController, CUser::IndexRealName }, rn);
const int c1 = this->updateOnlineStation(callsign, vm, false, true); const int c1 = this->updateOnlineStation(callsign, vm, false, true);
const int c2 = this->updateBookedStation(callsign, vm, false, true); const int c2 = this->updateBookedStation(callsign, vm, false, true);
wasAtc = c1 > 0 || c2 > 0; wasAtc = c1 > 0 || c2 > 0;
@@ -484,14 +487,13 @@ namespace BlackCore
if (!wasAtc) if (!wasAtc)
{ {
const CPropertyIndexVariantMap vm = CPropertyIndexVariantMap({CSimulatedAircraft::IndexPilot, CUser::IndexRealName}, realname); const CPropertyIndexVariantMap vm = CPropertyIndexVariantMap({CSimulatedAircraft::IndexPilot, CUser::IndexRealName}, rn);
this->updateAircraftInRange(callsign, vm); this->updateAircraftInRange(callsign, vm);
} }
// Client // Client
if (!sApp || sApp->isShuttingDown() || !sApp->getWebDataServices()) { return; }
const CVoiceCapabilities voiceCaps = sApp->getWebDataServices()->getVoiceCapabilityForCallsign(callsign); const CVoiceCapabilities voiceCaps = sApp->getWebDataServices()->getVoiceCapabilityForCallsign(callsign);
CPropertyIndexVariantMap vm = CPropertyIndexVariantMap({ CClient::IndexUser, CUser::IndexRealName }, realname); CPropertyIndexVariantMap vm = CPropertyIndexVariantMap({ CClient::IndexUser, CUser::IndexRealName }, rn);
vm.addValue({ CClient::IndexVoiceCapabilities }, voiceCaps); vm.addValue({ CClient::IndexVoiceCapabilities }, voiceCaps);
this->updateOrAddClient(callsign, vm, false); this->updateOrAddClient(callsign, vm, false);
} }

12
src/blackcore/fsd/atcdataupdate.h
View File

@@ -58,15 +58,15 @@ namespace BlackCore
//! Equal to operator //! Equal to operator
inline bool operator==(const AtcDataUpdate &lhs, const AtcDataUpdate &rhs) inline bool operator==(const AtcDataUpdate &lhs, const AtcDataUpdate &rhs)
{ {
return lhs.sender() == rhs.sender() && return lhs.sender() == rhs.sender() &&
lhs.receiver() == rhs.receiver() && lhs.receiver() == rhs.receiver() &&
lhs.m_frequencykHz == rhs.m_frequencykHz && lhs.m_frequencykHz == rhs.m_frequencykHz &&
lhs.m_facility == rhs.m_facility && lhs.m_facility == rhs.m_facility &&
lhs.m_visibleRange == rhs.m_visibleRange && lhs.m_visibleRange == rhs.m_visibleRange &&
lhs.m_rating == rhs.m_rating && lhs.m_rating == rhs.m_rating &&
qFuzzyCompare(1 + lhs.m_latitude, 1 + rhs.m_latitude) && qFuzzyCompare(1 + lhs.m_latitude, 1 + rhs.m_latitude) &&
qFuzzyCompare(1 + lhs.m_longitude, 1 + rhs.m_longitude) && qFuzzyCompare(1 + lhs.m_longitude, 1 + rhs.m_longitude) &&
lhs.m_elevation == rhs.m_elevation; lhs.m_elevation == rhs.m_elevation;
} }
//! Not equal to operator //! Not equal to operator