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

Ref T773, improved info texts and statistics values

Browse Source
This commit is contained in:
Klaus Basan
2020-02-20 02:25:27 +01:00
committed by Mat Sutcliffe
parent f2096bd826
commit 181c2b8061
5 changed files with 46 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/blackgui/components/interpolationlogdisplay.cpp
View File

@@ -371,7 +371,6 @@ namespace BlackGui
void CInterpolationLogDisplay::onElevationReceived(const CElevationPlane &elevationPlane, const CCallsign &callsign)
{
m_elvReceived++;
if (m_elvHistoryCount > 0)
{
const QString history = callsign.asString() %
@@ -388,6 +387,7 @@ namespace BlackGui
}
}
// not for a real plane, but to get elevation at any position for testing
if (callsign == CInterpolationLogDisplay::pseudoCallsignElevation())
{
this->displayArbitraryElevation(elevationPlane);
@@ -395,6 +395,9 @@ namespace BlackGui
}
if (!this->logCallsign(callsign)) { return; }
// for logged callsign
m_elvReceivedLoggedCs++;
ui->le_Elevation->setText(elevationPlane.toQString());
this->displayElevationRequestReceive();
ui->led_Elevation->blink();
@@ -402,8 +405,11 @@ namespace BlackGui
void CInterpolationLogDisplay::onElevationRequested(const CCallsign &callsign)
{
if (!this->logCallsign(callsign)) { return; }
m_elvRequested++;
if (!this->logCallsign(callsign)) { return; }
// for logged callsign
m_elvRequestedLoggedCs++;
this->displayElevationRequestReceive();
ui->led_Elevation->blink();
}
@@ -456,10 +462,12 @@ namespace BlackGui
ui->le_CG->clear();
ui->le_Elevation->clear();
ui->le_ElevationReqRec->clear();
ui->le_ElevationReqRec->setToolTip("elevation requested");
ui->le_Parts->clear();
ui->le_UpdateTimes->clear();
ui->le_UpdateTimes->clear();
ui->le_Limited->clear();
m_elvReceivedLoggedCs = m_elvRequestedLoggedCs = 0;
m_elvReceived = m_elvRequested = 0;
m_lastInterpolations.clear();
@@ -551,10 +559,14 @@ namespace BlackGui
void CInterpolationLogDisplay::displayElevationRequestReceive()
{
if (!m_airspaceMonitor) { return; }
static const QString info("%1/%2 hits %3 times: %4");
static const QString info("req. %1, %2/rec. %3, %4 | found/missed: '%5' | times: %6");
const QString foundMissed = m_airspaceMonitor->getElevationsFoundMissedInfo();
const QString reqTimes = m_airspaceMonitor->getElevationRequestTimesInfo();
ui->le_ElevationReqRec->setText(info.arg(m_elvRequested).arg(m_elvReceived).arg(foundMissed, reqTimes));
const QString reqRec = info.arg(m_elvRequestedLoggedCs).arg(m_elvRequested).arg(m_elvReceivedLoggedCs).arg(m_elvReceived).arg(foundMissed, reqTimes);
ui->le_ElevationReqRec->setText(reqRec);
ui->le_ElevationReqRec->setToolTip(reqRec);
ui->le_ElevationReqRec->home(false);
}
void CInterpolationLogDisplay::displayArbitraryElevation(const CElevationPlane &elevation)

14
src/blackgui/components/interpolationlogdisplay.h
View File

@@ -182,13 +182,17 @@ namespace BlackGui
QScopedPointer<Ui::CInterpolationLogDisplay> ui;
QTimer m_updateTimer;
QPointer<BlackCore::ISimulator> m_simulator; //!< related simulator
QPointer<BlackCore::CAirspaceMonitor> m_airspaceMonitor; //!< related airspace monitor
QPointer<BlackCore::ISimulator> m_simulator; //!< related simulator
QPointer<BlackCore::CAirspaceMonitor> m_airspaceMonitor; //!< related airspace monitor
BlackMisc::Aviation::CAircraftSituationList m_lastInterpolations; //!< list of last interpolations
BlackMisc::Aviation::CCallsign m_callsign; //!< current callsign
int m_elvRequested = 0; //!< counted via signal
int m_elvReceived = 0; //!< counted via signal
int m_elvHistoryCount = -1; //!< how many in history
int m_elvRequested = 0; //!< counted via signal
int m_elvReceived = 0; //!< counted via signal
int m_elvRequestedLoggedCs = 0; //!< counted via signal
int m_elvReceivedLoggedCs = 0; //!< counted via signal
int m_elvHistoryCount = -1; //!< how many in history
QStringListModel *m_elvHistoryModel = nullptr;
static const QString &startText();