diff --git a/src/blackcore/simulator.cpp b/src/blackcore/simulator.cpp index 393d5ea88..55ec0e528 100644 --- a/src/blackcore/simulator.cpp +++ b/src/blackcore/simulator.cpp @@ -261,6 +261,7 @@ namespace BlackCore this->clearAllRemoteAircraftData(); // reset m_averageFps = -1.0; m_simTimeRatio = 1.0; + m_trackMilesShort = 0.0; } bool ISimulator::isUpdateAllRemoteAircraft(qint64 currentTimestamp) const @@ -1037,6 +1038,7 @@ namespace BlackCore { m_averageFps = -1.0; m_simTimeRatio = 1.0; + m_trackMilesShort = 0.0; return true; } diff --git a/src/blackcore/simulator.h b/src/blackcore/simulator.h index a40cebc21..2dc35ac90 100644 --- a/src/blackcore/simulator.h +++ b/src/blackcore/simulator.h @@ -221,6 +221,9 @@ namespace BlackCore //! Ratio of simulation time to real time, due to low FPS double getSimTimeRatio() const { return m_simTimeRatio; } + //! Number of track miles over-reported, due to low FPS + double getTrackMilesShort() const { return m_trackMilesShort; } + //! Send situation/parts for testing virtual bool testSendSituationAndParts(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftSituation &situation, const BlackMisc::Aviation::CAircraftParts &parts) = 0; @@ -583,6 +586,7 @@ namespace BlackCore double m_statsUpdateAircraftTimeAvgMs = 0; //!< statistics average update time double m_averageFps = -1.0; //!< FPS double m_simTimeRatio = 1.0; //!< ratio of simulation time to real time, due to low FPS (X-Plane) + double m_trackMilesShort = 0.0; //!< difference between real and reported groundspeed, multiplied by time qint64 m_updateAllRemoteAircraftUntil = 0; //!< force an update of all remote aircraft, used when own aircraft is moved, paused to make sure all remote aircraft are updated qint64 m_statsUpdateAircraftTimeTotalMs = 0; //!< statistics total update time qint64 m_statsCurrentUpdateTimeMs = 0; //!< statistics current update time diff --git a/src/blackgui/components/simulatorcomponent.cpp b/src/blackgui/components/simulatorcomponent.cpp index 069de9148..1f16bd61e 100644 --- a/src/blackgui/components/simulatorcomponent.cpp +++ b/src/blackgui/components/simulatorcomponent.cpp @@ -153,7 +153,10 @@ namespace BlackGui this->addOrUpdateLiveDataByName(QStringLiteral("FPS"), fps < 0 ? QStringLiteral("N/A") : QString::number(fps, 'f', 1), CIconList::allIcons().findByIndex(CIcons::ApplicationSimulator)); const double ratio = sGui->getISimulator()->getSimTimeRatio(); - this->addOrUpdateLiveDataByName(QStringLiteral("Time Ratio"), QString::number(ratio), CIconList::allIcons().findByIndex(CIcons::ApplicationSimulator)); + this->addOrUpdateLiveDataByName(QStringLiteral("Time Ratio"), QString::number(ratio, 'f', 2), CIconList::allIcons().findByIndex(CIcons::ApplicationSimulator)); + + const double miles = sGui->getISimulator()->getTrackMilesShort(); + this->addOrUpdateLiveDataByName(QStringLiteral("Miles Short"), QString::number(miles, 'f', 1), CIconList::allIcons().findByIndex(CIcons::ApplicationSimulator)); } } diff --git a/src/plugins/simulator/xplane/simulatorxplane.cpp b/src/plugins/simulator/xplane/simulatorxplane.cpp index cd9d2f913..de1c43dd0 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.cpp +++ b/src/plugins/simulator/xplane/simulatorxplane.cpp @@ -369,7 +369,7 @@ namespace BlackSimPlugin if ((m_slowTimerCalls % 5u) == 0u) { // reading FPS resets average, so we only monitor over some time - m_serviceProxy->getFrameStats(&m_averageFps, &m_simTimeRatio); + m_serviceProxy->getFrameStats(&m_averageFps, &m_simTimeRatio, &m_trackMilesShort); } } } diff --git a/src/plugins/simulator/xplane/xswiftbusserviceproxy.cpp b/src/plugins/simulator/xplane/xswiftbusserviceproxy.cpp index 0aa81a037..5aec10f49 100644 --- a/src/plugins/simulator/xplane/xswiftbusserviceproxy.cpp +++ b/src/plugins/simulator/xplane/xswiftbusserviceproxy.cpp @@ -319,30 +319,32 @@ namespace BlackSimPlugin m_dbusInterface->callDBusAsync(QLatin1String("isUsingRealTime"), setterCallback(o_isRealTime)); } - void CXSwiftBusServiceProxy::getFrameStats(double *o_averageFps, double *o_simTimeRatio) const + void CXSwiftBusServiceProxy::getFrameStats(double *o_averageFps, double *o_simTimeRatio, double *o_trackMilesLost) const { std::function callback = [ = ](QDBusPendingCallWatcher * watcher) { - QDBusPendingReply reply = *watcher; + QDBusPendingReply reply = *watcher; if (!reply.isError()) { *o_averageFps = reply.argumentAt<0>(); *o_simTimeRatio = reply.argumentAt<1>(); + *o_trackMilesLost = reply.argumentAt<2>(); } watcher->deleteLater(); }; m_dbusInterface->callDBusAsync(QLatin1String("getFrameStats"), callback)->waitForFinished(); } - void CXSwiftBusServiceProxy::getFrameStatsAsync(double *o_averageFps, double *o_simTimeRatio) + void CXSwiftBusServiceProxy::getFrameStatsAsync(double *o_averageFps, double *o_simTimeRatio, double *o_trackMilesLost) { std::function callback = [ = ](QDBusPendingCallWatcher * watcher) { - QDBusPendingReply reply = *watcher; + QDBusPendingReply reply = *watcher; if (!reply.isError()) { *o_averageFps = reply.argumentAt<0>(); *o_simTimeRatio = reply.argumentAt<1>(); + *o_trackMilesLost = reply.argumentAt<2>(); } watcher->deleteLater(); }; diff --git a/src/plugins/simulator/xplane/xswiftbusserviceproxy.h b/src/plugins/simulator/xplane/xswiftbusserviceproxy.h index e88bbabc9..da2d7abca 100644 --- a/src/plugins/simulator/xplane/xswiftbusserviceproxy.h +++ b/src/plugins/simulator/xplane/xswiftbusserviceproxy.h @@ -210,8 +210,8 @@ namespace BlackSimPlugin //! \copydoc XSwiftBus::CService::getFrameStats //! @{ - void getFrameStats(double *o_averageFps, double *o_simTimeRatio) const; - void getFrameStatsAsync(double *o_averageFps, double *o_simTimeRatio); + void getFrameStats(double *o_averageFps, double *o_simTimeRatio, double *o_trackMilesLost) const; + void getFrameStatsAsync(double *o_averageFps, double *o_simTimeRatio, double *o_trackMilesLost); //! @} //! \copydoc XSwiftBus::CService::getLatitudeDeg diff --git a/src/xswiftbus/org.swift_project.xswiftbus.service.xml b/src/xswiftbus/org.swift_project.xswiftbus.service.xml index 0153446ab..cf66e6030 100644 --- a/src/xswiftbus/org.swift_project.xswiftbus.service.xml +++ b/src/xswiftbus/org.swift_project.xswiftbus.service.xml @@ -66,6 +66,7 @@ R"XML( + diff --git a/src/xswiftbus/plugin.cpp b/src/xswiftbus/plugin.cpp index 4b31105f7..04092dbc4 100644 --- a/src/xswiftbus/plugin.cpp +++ b/src/xswiftbus/plugin.cpp @@ -161,6 +161,7 @@ namespace XSwiftBus if (m_service) { m_service->onAircraftModelChanged(); + m_service->resetMilesLost(); } } @@ -169,6 +170,7 @@ namespace XSwiftBus if (m_service) { m_service->updateAirportsInRange(); + m_service->resetMilesLost(); } } diff --git a/src/xswiftbus/service.cpp b/src/xswiftbus/service.cpp index eff5e4a2f..4d915faf2 100644 --- a/src/xswiftbus/service.cpp +++ b/src/xswiftbus/service.cpp @@ -14,6 +14,7 @@ #include #include +#include #include #include @@ -28,31 +29,35 @@ namespace XSwiftBus { DataRef m_thisFramePeriod; DataRef m_thisFramePeriodXP11; + DataRef m_groundSpeed; + std::vector m_samples; float m_total = 0; float m_totalOverBudget = 0; + float m_totalMetersShort = 0; size_t m_lastSampleIndex = 0; static constexpr size_t c_maxSampleCount = 500; static constexpr float c_framePeriodBudget = 0.05f; FramePeriodSampler() : CDrawable(xplm_Phase_LastCockpit, false) {} - std::pair getFrameStats() + std::tuple getFrameStats() { if (m_total == 0) { return {}; } const float fps = m_samples.size() / m_total; const float ratio = 1 - m_totalOverBudget / m_total; + const float miles = m_totalMetersShort / 1852.0f; m_total = 0; m_totalOverBudget = 0; m_samples.clear(); m_lastSampleIndex = 0; - return { fps, ratio }; + return std::make_tuple(fps, ratio, miles); } protected: virtual void draw() override // called once per frame { - float current = m_thisFramePeriodXP11.isValid() ? m_thisFramePeriodXP11.get() : m_thisFramePeriod.get(); + const float current = m_thisFramePeriodXP11.isValid() ? m_thisFramePeriodXP11.get() : m_thisFramePeriod.get(); ++m_lastSampleIndex %= c_maxSampleCount; if (m_samples.size() == c_maxSampleCount) @@ -72,6 +77,9 @@ namespace XSwiftBus { m_totalOverBudget += current - c_framePeriodBudget; } + + const float metersShort = m_groundSpeed.get() * std::max(0.0f, current - c_framePeriodBudget); + m_totalMetersShort += metersShort; } }; @@ -110,11 +118,20 @@ namespace XSwiftBus return XSWIFTBUS_COMMIT; } - std::pair CService::getFrameStats() + std::tuple CService::getFrameStats() { if (!m_framePeriodSampler) { return {}; } const auto result = m_framePeriodSampler->getFrameStats(); - return { static_cast(result.first), static_cast(result.second) }; + return std::make_tuple(static_cast(std::get<0>(result)), static_cast(std::get<1>(result)), static_cast(std::get<2>(result))); + } + + void CService::resetMilesLost() + { + if (m_framePeriodSampler) + { + m_framePeriodSampler->m_totalMetersShort = 0; + m_framePeriodSampler->m_totalSecondsLate = 0; + } } void CService::addTextMessage(const std::string &text, double red, double green, double blue) @@ -570,8 +587,9 @@ namespace XSwiftBus const auto stats = getFrameStats(); CDBusMessage reply = CDBusMessage::createReply(sender, serial); reply.beginArgumentWrite(); - reply.appendArgument(stats.first); - reply.appendArgument(stats.second); + reply.appendArgument(std::get<0>(stats)); + reply.appendArgument(std::get<1>(stats)); + reply.appendArgument(std::get<2>(stats)); sendDBusMessage(reply); }); } diff --git a/src/xswiftbus/service.h b/src/xswiftbus/service.h index a1e6c657b..74b518cdf 100644 --- a/src/xswiftbus/service.h +++ b/src/xswiftbus/service.h @@ -113,8 +113,12 @@ namespace XSwiftBus //! Frames-per-second, averaged over the last 500 frames, //! or since this function was last called, whichever is later. //! Second part is the average simulation time ratio during the same period. + //! Third part is the total track miles over-reported during the same period. //! \return Zero if no samples were collected since this function was last called. - std::pair getFrameStats(); + std::tuple getFrameStats(); + + //! Reset the monitoring of total track miles lost due to low frame rate. + void resetMilesLost(); //! Get aircraft latitude in degrees double getLatitudeDeg() const { return m_latitude.get(); }