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

Ref T698, improved display of statistics

Browse Source
This commit is contained in:
Klaus Basan
2019-07-05 01:53:26 +02:00
parent c78b42d5ea
commit 736c22fe65
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/blackcore/network.cpp
View File

@@ -32,6 +32,7 @@ namespace BlackCore
m_statistics = true; m_statistics = true;
} }
} }
int INetwork::increaseStatisticsValue(const QString &identifier, const QString &appendix) int INetwork::increaseStatisticsValue(const QString &identifier, const QString &appendix)
{ {
if (identifier.isEmpty() || !m_statistics) { return -1; } if (identifier.isEmpty() || !m_statistics) { return -1; }
@@ -47,18 +48,19 @@ namespace BlackCore
QString INetwork::getNetworkStatisticsAsText(bool reset, const QString &separator) QString INetwork::getNetworkStatisticsAsText(bool reset, const QString &separator)
{ {
QMap<int, QString> transformed; QVector<std::pair<int, QString>> transformed;
for (const auto pair : makePairsRange(as_const(m_callStatistics))) for (const auto pair : makePairsRange(as_const(m_callStatistics)))
{ {
// key is pair.first, value is pair.second // key is pair.first, value is pair.second
transformed.insertMulti(pair.second, pair.first); transformed.push_back({ pair.second, pair.first });
} }
if (reset) { this->clearStatistics(); } if (reset) { this->clearStatistics(); }
// sorted by value // sorted by value
std::sort(transformed.begin(), transformed.end(), std::greater<>());
QString stats; QString stats;
for (const auto pair : makePairsRange(as_const(transformed))) for (const auto &pair : transformed)
{ {
stats += stats +=
(stats.isEmpty() ? QString() : separator) % (stats.isEmpty() ? QString() : separator) %
@@ -66,4 +68,5 @@ namespace BlackCore
} }
return stats; return stats;
} }
} // ns } // ns

20
src/blackcore/vatsim/networkvatlib.cpp
View File

@@ -636,7 +636,7 @@ namespace BlackCore
Vat_SendClientQuery(m_net.data(), vatClientQueryFreq, toFSD(callsign)); Vat_SendClientQuery(m_net.data(), vatClientQueryFreq, toFSD(callsign));
// statistics // statistics
this->increaseStatisticsValue(QStringLiteral("Vat_SendClientQuery")); this->increaseStatisticsValue(QStringLiteral("Vat_SendClientQuery"), vatClientQueryFreq);
} }
void CNetworkVatlib::sendUserInfoQuery(const CCallsign &callsign) void CNetworkVatlib::sendUserInfoQuery(const CCallsign &callsign)
@@ -645,7 +645,7 @@ namespace BlackCore
Vat_SendClientQuery(m_net.data(), vatClientQueryInfo, toFSD(callsign)); Vat_SendClientQuery(m_net.data(), vatClientQueryInfo, toFSD(callsign));
// statistics // statistics
this->increaseStatisticsValue(QStringLiteral("Vat_SendClientQuery")); this->increaseStatisticsValue(QStringLiteral("Vat_SendClientQuery"), vatClientQueryInfo);
} }
void CNetworkVatlib::setInterimPositionReceivers(const CCallsignSet &receivers) void CNetworkVatlib::setInterimPositionReceivers(const CCallsignSet &receivers)
@@ -686,7 +686,7 @@ namespace BlackCore
Vat_SendClientQuery(m_net.data(), vatClientQueryAtc, toFSD(callsign)); Vat_SendClientQuery(m_net.data(), vatClientQueryAtc, toFSD(callsign));
// statistics // statistics
this->increaseStatisticsValue(QStringLiteral("Vat_SendClientQuery")); this->increaseStatisticsValue(QStringLiteral("Vat_SendClientQuery"), vatClientQueryAtc);
} }
void CNetworkVatlib::sendAtisQuery(const CCallsign &callsign) void CNetworkVatlib::sendAtisQuery(const CCallsign &callsign)
@@ -699,7 +699,7 @@ namespace BlackCore
Vat_SendClientQuery(m_net.data(), vatClientQueryAtis, toFSD(callsign)); Vat_SendClientQuery(m_net.data(), vatClientQueryAtis, toFSD(callsign));
// statistics // statistics
this->increaseStatisticsValue(QStringLiteral("Vat_SendClientQuery")); this->increaseStatisticsValue(QStringLiteral("Vat_SendClientQuery"), vatClientQueryAtis);
} }
void CNetworkVatlib::sendFlightPlan(const CFlightPlan &flightPlan) void CNetworkVatlib::sendFlightPlan(const CFlightPlan &flightPlan)
@@ -759,7 +759,7 @@ namespace BlackCore
Vat_SendClientQuery(m_net.data(), vatClientQueryFP, toFSD(callsign)); Vat_SendClientQuery(m_net.data(), vatClientQueryFP, toFSD(callsign));
// statistics // statistics
this->increaseStatisticsValue(QStringLiteral("Vat_SendClientQuery")); this->increaseStatisticsValue(QStringLiteral("Vat_SendClientQuery"), vatClientQueryFP);
} }
void CNetworkVatlib::sendRealNameQuery(const CCallsign &callsign) void CNetworkVatlib::sendRealNameQuery(const CCallsign &callsign)
@@ -768,7 +768,7 @@ namespace BlackCore
Vat_SendClientQuery(m_net.data(), vatClientQueryName, toFSD(callsign)); Vat_SendClientQuery(m_net.data(), vatClientQueryName, toFSD(callsign));
// statistics // statistics
this->increaseStatisticsValue(QStringLiteral("Vat_SendClientQuery")); this->increaseStatisticsValue(QStringLiteral("Vat_SendClientQuery"), vatClientQueryName);
} }
void CNetworkVatlib::sendCapabilitiesQuery(const CCallsign &callsign) void CNetworkVatlib::sendCapabilitiesQuery(const CCallsign &callsign)
@@ -777,7 +777,7 @@ namespace BlackCore
Vat_SendClientQuery(m_net.data(), vatClientQueryCaps, toFSD(callsign)); Vat_SendClientQuery(m_net.data(), vatClientQueryCaps, toFSD(callsign));
// statistics // statistics
this->increaseStatisticsValue(QStringLiteral("Vat_SendClientQuery")); this->increaseStatisticsValue(QStringLiteral("Vat_SendClientQuery"), vatClientQueryCaps);
} }
void CNetworkVatlib::replyToFrequencyQuery(const CCallsign &callsign) // private void CNetworkVatlib::replyToFrequencyQuery(const CCallsign &callsign) // private
@@ -786,7 +786,7 @@ namespace BlackCore
Vat_SendClientQueryResponse(m_net.data(), vatClientQueryFreq, toFSD(callsign), toFSD(response)(), response.size()); Vat_SendClientQueryResponse(m_net.data(), vatClientQueryFreq, toFSD(callsign), toFSD(response)(), response.size());
// statistics // statistics
this->increaseStatisticsValue(QStringLiteral("Vat_SendClientQueryResponse")); this->increaseStatisticsValue(QStringLiteral("Vat_SendClientQueryResponse"), vatClientQueryFreq);
} }
void CNetworkVatlib::replyToNameQuery(const CCallsign &callsign) // private void CNetworkVatlib::replyToNameQuery(const CCallsign &callsign) // private
@@ -795,7 +795,7 @@ namespace BlackCore
Vat_SendClientQueryResponse(m_net.data(), vatClientQueryName, toFSD(callsign), toFSD(response)(), response.size()); Vat_SendClientQueryResponse(m_net.data(), vatClientQueryName, toFSD(callsign), toFSD(response)(), response.size());
// statistics // statistics
this->increaseStatisticsValue(QStringLiteral("Vat_SendClientQueryResponse")); this->increaseStatisticsValue(QStringLiteral("Vat_SendClientQueryResponse"), vatClientQueryName);
} }
void CNetworkVatlib::replyToConfigQuery(const CCallsign &callsign) void CNetworkVatlib::replyToConfigQuery(const CCallsign &callsign)
@@ -1100,6 +1100,7 @@ namespace BlackCore
// statistics // statistics
self->increaseStatisticsValue(__func__); self->increaseStatisticsValue(__func__);
// if (!isInRange) { return; } // sort out all broadcasted we DO NOT NEED
QJsonParseError parserError; QJsonParseError parserError;
const QByteArray json = self->fromFSD(aircraftConfig).toUtf8(); const QByteArray json = self->fromFSD(aircraftConfig).toUtf8();
const QJsonDocument doc = QJsonDocument::fromJson(json, &parserError); const QJsonDocument doc = QJsonDocument::fromJson(json, &parserError);
@@ -1113,6 +1114,7 @@ namespace BlackCore
const QJsonObject packet = doc.object(); const QJsonObject packet = doc.object();
if (packet == JsonPackets::aircraftConfigRequest()) if (packet == JsonPackets::aircraftConfigRequest())
{ {
// this MUST work for NOT IN RANGE aircraft as well
self->replyToConfigQuery(callsign); self->replyToConfigQuery(callsign);
return; return;
} }