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

Style

Browse Source
This commit is contained in:
Klaus Basan
2019-07-03 02:38:04 +02:00
committed by Mat Sutcliffe
parent be3283305a
commit 92baa16536
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/blackcore/airspacemonitor.cpp
View File

@@ -111,8 +111,8 @@ namespace BlackCore
connect(m_analyzer, &CAirspaceAnalyzer::airspaceAircraftSnapshot, this, &CAirspaceMonitor::airspaceAircraftSnapshot, Qt::QueuedConnection);
// Analyzer
connect(m_analyzer, &CAirspaceAnalyzer::timeoutAircraft, this, &CAirspaceMonitor::onPilotDisconnected, Qt::QueuedConnection);
connect(m_analyzer, &CAirspaceAnalyzer::timeoutAtc, this, &CAirspaceMonitor::onAtcControllerDisconnected, Qt::QueuedConnection);
connect(m_analyzer, &CAirspaceAnalyzer::timeoutAircraft, this, &CAirspaceMonitor::onPilotDisconnected, Qt::QueuedConnection);
connect(m_analyzer, &CAirspaceAnalyzer::timeoutAtc, this, &CAirspaceMonitor::onAtcControllerDisconnected, Qt::QueuedConnection);
}
bool CAirspaceMonitor::updateFastPositionEnabled(const CCallsign &callsign, bool enableFastPositonUpdates)
@@ -725,7 +725,8 @@ namespace BlackCore
const ReverseLookupLogging reverseLookupEnabled = this->isReverseLookupMessagesEnabled();
CStatusMessageList reverseLookupMessages;
CStatusMessageList *pReverseLookupMessages = reverseLookupEnabled.testFlag(RevLogEnabled) ? &reverseLookupMessages : nullptr;
CMatchingUtils::addLogDetailsToList(pReverseLookupMessages, callsign, QString("Data from network: aircraft '%1', airline '%2', livery '%3'").
CMatchingUtils::addLogDetailsToList(pReverseLookupMessages, callsign,
QStringLiteral("Data from network: aircraft '%1', airline '%2', livery '%3'").
arg(aircraftIcaoDesignator, airlineIcaoDesignator, livery),
CAirspaceMonitor::getLogCategories());
@@ -1112,10 +1113,12 @@ namespace BlackCore
void CAirspaceMonitor::onAircraftConfigReceived(const CCallsign &callsign, const QJsonObject &jsonObject, qint64 currentOffsetMs)
{
Q_ASSERT(CThreadUtils::isCurrentThreadObjectThread(this));
this->storeAircraftParts(callsign, jsonObject, currentOffsetMs);
BLACK_AUDIT_X(!callsign.isEmpty(), Q_FUNC_INFO, "Need callsign");
if (callsign.isEmpty()) { return; }
// store parts
this->storeAircraftParts(callsign, jsonObject, currentOffsetMs);
// update client capability
CClient client = this->getClientOrDefaultForCallsign(callsign);
client.setUserCallsign(callsign); // make valid by setting a callsign

4
src/blackcore/vatsim/networkvatlib.h
View File

@@ -46,7 +46,7 @@ class QCommandLineOption;
namespace BlackMisc
{
namespace Aviation { class CFlightPlan; }
namespace Aviation { class CFlightPlan; }
namespace Simulation { class CSimulatedAircraft; }
}
@@ -308,7 +308,7 @@ namespace BlackCore
BlackMisc::CSettingReadOnly<BlackCore::Vatsim::TRawFsdMessageSetting> m_fsdMessageSetting { this, &CNetworkVatlib::fsdMessageSettingsChanged };
QFile m_rawFsdMessageLogFile;
bool m_rawFsdMessagesEnabled = false;
bool m_rawFsdMessagesEnabled = false;
bool m_filterPasswordFromLogin = false;
};
} //namespace

4
src/blackmisc/timestampobjectlist.cpp
View File

@@ -420,8 +420,8 @@ namespace BlackMisc
const ITimestampBased &l = last;
const ITimestampBased &o = object;
const qint64 diff = l.getAbsTimeDifferenceMs(o);
if (diff > mmm.max) { mmm.max = diff; }
if (diff < mmm.min) { mmm.min = diff; }
if (diff > mmm.max) { mmm.max = diff; }
if (diff < mmm.min) { mmm.min = diff; }
mean += diff;
}
c++;