From c58f02bf418a20da97633788b2b98b7338d78a2d Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Tue, 12 Jun 2018 02:04:57 +0200 Subject: [PATCH] Ref T275, display elevation cache hits in log display --- .../components/interpolationlogdisplay.cpp | 18 +++++++++++++---- .../components/interpolationlogdisplay.h | 4 ++++ .../components/interpolationlogdisplay.ui | 20 +++++++++---------- 3 files changed, 28 insertions(+), 14 deletions(-) diff --git a/src/blackgui/components/interpolationlogdisplay.cpp b/src/blackgui/components/interpolationlogdisplay.cpp index a013d0682..ea1f865c4 100644 --- a/src/blackgui/components/interpolationlogdisplay.cpp +++ b/src/blackgui/components/interpolationlogdisplay.cpp @@ -133,6 +133,10 @@ namespace BlackGui const CClient client = m_airspaceMonitor->getClientOrDefaultForCallsign(m_callsign); ui->le_GndFlag->setText(boolToYesNo(client.hasGndFlagCapability())); + static const QString hits("%1/%2"); + const QPair foundMissed = m_airspaceMonitor->getElevationsFoundMissed(); + ui->le_ElevationHits->setText(hits.arg(foundMissed.first).arg(foundMissed.second)); + this->displayLastInterpolation(); } } @@ -281,7 +285,7 @@ namespace BlackGui if (!this->logCallsign(callsign)) { return; } m_elvReceived++; ui->le_Elevation->setText(plane.toQString()); - ui->le_ElevationRec->setText(QString::number(m_elvReceived)); + this->displayElevationRequestReceive(); ui->led_Elevation->blink(); } @@ -289,7 +293,7 @@ namespace BlackGui { if (!this->logCallsign(callsign)) { return; } m_elvRequested++; - ui->le_ElevationReq->setText(QString::number(m_elvRequested)); + this->displayElevationRequestReceive(); ui->led_Elevation->blink(); } @@ -305,8 +309,8 @@ namespace BlackGui ui->te_TextLog->clear(); ui->le_CG->clear(); ui->le_Elevation->clear(); - ui->le_ElevationRec->clear(); - ui->le_ElevationReq->clear(); + ui->le_ElevationReqRec->clear(); + ui->le_ElevationHits->clear(); ui->le_Parts->clear(); ui->le_UpdateTimes->clear(); ui->le_UpdateTimes->clear(); @@ -363,6 +367,12 @@ namespace BlackGui }); } + void CInterpolationLogDisplay::displayElevationRequestReceive() + { + static const QString rr("%1/%2"); + ui->le_ElevationReqRec->setText(rr.arg(m_elvRequested).arg(m_elvReceived)); + } + void CInterpolationLogDisplay::linkWithAirspaceMonitor() { if (!sGui || sGui->isShuttingDown() || !sGui->supportsContexts()) { return; } diff --git a/src/blackgui/components/interpolationlogdisplay.h b/src/blackgui/components/interpolationlogdisplay.h index a6e85aa6e..ab820d8e8 100644 --- a/src/blackgui/components/interpolationlogdisplay.h +++ b/src/blackgui/components/interpolationlogdisplay.h @@ -42,6 +42,7 @@ namespace BlackGui enum Tab { TabFlow, + TabFlow2, TabInterpolation, TabTextLog }; @@ -122,6 +123,9 @@ namespace BlackGui //! Init the parts view void initPartsView(); + //! Display elevation requested/receive + void displayElevationRequestReceive(); + QScopedPointer ui; QTimer m_updateTimer; QPointer m_simulatorCommon; //!< related simulator diff --git a/src/blackgui/components/interpolationlogdisplay.ui b/src/blackgui/components/interpolationlogdisplay.ui index 7532ef158..1b022b12f 100644 --- a/src/blackgui/components/interpolationlogdisplay.ui +++ b/src/blackgui/components/interpolationlogdisplay.ui @@ -290,7 +290,7 @@ - + elevation received @@ -298,7 +298,7 @@ true - rec. + hits/missed @@ -334,16 +334,16 @@ - + - Req.: + Req/rec: - + - Rec.: + Hits: @@ -426,7 +426,7 @@ - + elevation requested @@ -434,7 +434,7 @@ true - req. + req./rec. @@ -743,8 +743,8 @@ le_UpdateCount le_UpdateTimes le_Limited - le_ElevationReq - le_ElevationRec + le_ElevationReqRec + le_ElevationHits le_Elevation le_SimulatorSpecific tvp_AircraftSituations