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

Ref T275, unified elevation missed info -> getElevationsFoundMissedInfo()

Browse Source
This commit is contained in:
Klaus Basan
2018-06-19 02:11:24 +02:00
parent 984f06f79f
commit e0b95859c1
5 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -372,12 +372,9 @@ namespace BlackGui
void CInterpolationLogDisplay::displayElevationRequestReceive()
{
if (!m_airspaceMonitor) { return; }
static const QString rr("%1 / %2 hits %3 / %4 %5%");
const QPair<int, int> foundMissed = m_airspaceMonitor->getElevationsFoundMissed();
const int f = foundMissed.first;
const int m = foundMissed.second;
const double hitRatioPercent = 100.0 * static_cast<double>(f) / static_cast<double>(f + m);
ui->le_ElevationReqRec->setText(rr.arg(m_elvRequested).arg(m_elvReceived).arg(f).arg(m).arg(QString::number(hitRatioPercent, 'f', 1)));
static const QString info("%1/%2 hits %3");
const QString foundMissed = m_airspaceMonitor->getElevationsFoundMissedInfo();
ui->le_ElevationReqRec->setText(info.arg(m_elvRequested).arg(m_elvReceived).arg(foundMissed));
}
void CInterpolationLogDisplay::linkWithAirspaceMonitor()

2
src/blackmisc/simulation/interpolationlogger.cpp
View File

@@ -415,7 +415,7 @@ namespace BlackMisc
) %
(
withElevation ?
QStringLiteral("Elev info.: ") % elevationInfo %
QStringLiteral("Elev.info: ") % elevationInfo %
QStringLiteral(" scenery os: ") % sceneryOffset.valueRoundedWithUnit(1) % separator :
QStringLiteral("")
) %

4
src/blackmisc/simulation/interpolator.cpp
View File

@@ -224,8 +224,6 @@ namespace BlackMisc
// logging
if (this->doLogging())
{
static const QString elv("found %1 missed %2");
const QPair<int, int> elvStats = this->getElevationsFoundMissed();
log.tsCurrent = m_currentTimeMsSinceEpoch;
log.callsign = m_callsign;
log.groundFactor = currentSituation.getOnGroundFactor();
@@ -233,7 +231,7 @@ namespace BlackMisc
log.situationCurrent = currentSituation;
log.change = m_pastSituationsChange;
log.usedSetup = m_currentSetup;
log.elevationInfo = elv.arg(elvStats.first).arg(elvStats.second);
log.elevationInfo = this->getElevationsFoundMissedInfo();
log.cgAboveGround = currentSituation.getCG();
log.sceneryOffset = m_currentSceneryOffset;
m_logger->logInterpolation(log);

16
src/blackmisc/simulation/simulationenvironmentprovider.cpp
View File

@@ -141,6 +141,16 @@ namespace BlackMisc
return QPair<int, int>(m_elvFound, m_elvMissed);
}
QString ISimulationEnvironmentProvider::getElevationsFoundMissedInfo() const
{
static const QString info("%1/%2 %3");
const QPair<int, int> foundMissed = this->getElevationsFoundMissed();
const int f = foundMissed.first;
const int m = foundMissed.second;
const double hitRatioPercent = 100.0 * static_cast<double>(f) / static_cast<double>(f + m);
return info.arg(f).arg(m).arg(QString::number(hitRatioPercent, 'f', 1));
}
CSimulatorPluginInfo ISimulationEnvironmentProvider::getSimulatorPluginInfo() const
{
QReadLocker l(&m_lockModel);
@@ -258,6 +268,12 @@ namespace BlackMisc
return this->provider()->getElevationsFoundMissed();
}
QString CSimulationEnvironmentAware::getElevationsFoundMissedInfo() const
{
if (!this->hasProvider()) { return QString(); }
return this->provider()->getElevationsFoundMissedInfo();
}
CSimulatorPluginInfo CSimulationEnvironmentAware::getSimulatorPluginInfo() const
{
if (!this->hasProvider()) { return CSimulatorPluginInfo(); }

15
src/blackmisc/simulation/simulationenvironmentprovider.h
View File

@@ -52,6 +52,10 @@ namespace BlackMisc
//! \threadsafe
QPair<int, int> getElevationsFoundMissed() const;
//! Elevations found/missed statistics info as string
//! \threadsafe
QString getElevationsFoundMissedInfo() const;
//! Get the represented plugin
//! \threadsafe
CSimulatorPluginInfo getSimulatorPluginInfo() const;
@@ -88,7 +92,7 @@ namespace BlackMisc
//! Ctor
ISimulationEnvironmentProvider(const CSimulatorPluginInfo &pluginInfo);
//! All remembered coordiantes plus max remembered situations
//! All remembered coordiantes plus max.remembered situations
//! \threadsafe
Geo::CCoordinateGeodeticList getElevationCoordinates(int &maxRemembered) const;
@@ -146,10 +150,10 @@ namespace BlackMisc
CSimulatorPluginInfo m_simulatorPluginInfo; //!< info object
Geo::CCoordinateGeodeticList m_elvCoordinates;
QMap<Aviation::CCallsign, PhysicalQuantities::CLength> m_cgs; //! CGs
mutable int m_elvFound = 0; //!< statistics only
mutable int m_elvMissed = 0; //!< statistics only
mutable int m_elvFound = 0; //!< statistics only
mutable int m_elvMissed = 0; //!< statistics only
mutable QReadWriteLock m_lockElvCoordinates; //!< lock m_coordinates
mutable QReadWriteLock m_lockCG; //!< lock CGs
mutable QReadWriteLock m_lockCG; //!< lock CGs
mutable QReadWriteLock m_lockModel; //!< lock models
};
@@ -172,6 +176,9 @@ namespace BlackMisc
//! \copydoc ISimulationEnvironmentProvider::getElevationsFoundMissed
QPair<int, int> getElevationsFoundMissed() const;
//! \copydoc ISimulationEnvironmentProvider::getElevationsFoundMissedInfo
QString getElevationsFoundMissedInfo() const;
//! \copydoc ISimulationEnvironmentProvider::getSimulatorPluginInfo
CSimulatorPluginInfo getSimulatorPluginInfo() const;