diff --git a/src/blackcore/simulator.cpp b/src/blackcore/simulator.cpp index 39cd21b0a..45b046e86 100644 --- a/src/blackcore/simulator.cpp +++ b/src/blackcore/simulator.cpp @@ -958,7 +958,7 @@ namespace BlackCore QString ISimulator::getInvalidSituationLogMessage(const CCallsign &callsign, const CInterpolationStatus &status, const QString &details) const { - static const QString msg("CS: '%1' Interpolation: '%2'"); + static const QString msg("Interpolation ('%1'): '%2'"); const QString m = msg.arg(callsign.asString(), status.toQString()); if (details.isEmpty()) { return m; } diff --git a/src/blackmisc/simulation/simulationenvironmentprovider.h b/src/blackmisc/simulation/simulationenvironmentprovider.h index ff6eb6517..953352f7d 100644 --- a/src/blackmisc/simulation/simulationenvironmentprovider.h +++ b/src/blackmisc/simulation/simulationenvironmentprovider.h @@ -207,7 +207,7 @@ namespace BlackMisc CAircraftModel m_defaultModel; //!< default model int m_maxElevations = 100; //!< How many elevations we keep Geo::CCoordinateGeodeticList m_elvCoordinates; //!< elevation cache - Aviation::CTimestampPerCallsign m_pendingElevationRequests; //!< pending elevation requests + Aviation::CTimestampPerCallsign m_pendingElevationRequests; //!< pending elevation requests for aircraft callsign Aviation::CLengthPerCallsign m_cgsPerCallsign; //!< CGs per callsign QHash m_cgsPerModel; //!< CGs per model string qint64 m_statsMaxElevRequestTimeMs = -1; diff --git a/src/plugins/simulator/emulated/simulatoremulated.cpp b/src/plugins/simulator/emulated/simulatoremulated.cpp index af6c16980..cdac2526f 100644 --- a/src/plugins/simulator/emulated/simulatoremulated.cpp +++ b/src/plugins/simulator/emulated/simulatoremulated.cpp @@ -376,44 +376,51 @@ namespace BlackSimPlugin { if (!m_monitorWidget) return; m_monitorWidget->appendSendingCall("simulatorStatusChanged", CSimulatorEmulated::statusToString(status)); - }, Qt::QueuedConnection)); + }, + Qt::QueuedConnection)); m_connectionGuard.append(connect(this, &ISimulator::ownAircraftModelChanged, this, [ = ](CAircraftModel model) { if (!m_monitorWidget) return; m_monitorWidget->appendSendingCall("ownAircraftModelChanged", model.toQString()); - }, Qt::QueuedConnection)); + }, + Qt::QueuedConnection)); m_connectionGuard.append(connect(this, &ISimulator::renderRestrictionsChanged, this, [ = ](bool restricted, bool enabled, int maxAircraft, const CLength & maxRenderedDistance) { if (!m_monitorWidget) return; static const QString params("restricted: %1 enabled: %2 max aircraft: %3"); m_monitorWidget->appendSendingCall("renderRestrictionsChanged", params.arg(boolToYesNo(restricted), boolToYesNo(enabled)).arg(maxAircraft), maxRenderedDistance.valueRoundedWithUnit(CLengthUnit::m(), 1)); - }, Qt::QueuedConnection)); + }, + Qt::QueuedConnection)); m_connectionGuard.append(connect(this, &ISimulator::interpolationAndRenderingSetupChanged, this, [ = ]() { if (!m_monitorWidget) return; m_monitorWidget->appendSendingCall("interpolationAndRenderingSetupChanged"); - }, Qt::QueuedConnection)); + }, + Qt::QueuedConnection)); m_connectionGuard.append(connect(this, &ISimulator::aircraftRenderingChanged, this, [ = ](const CSimulatedAircraft & aircraft) { if (!m_monitorWidget) return; m_monitorWidget->appendSendingCall("aircraftRenderingChanged", aircraft.toQString()); - }, Qt::QueuedConnection)); + }, + Qt::QueuedConnection)); m_connectionGuard.append(connect(this, &ISimulator::physicallyAddingRemoteModelFailed, this, [ = ](const CSimulatedAircraft & aircraft) { if (!m_monitorWidget) return; m_monitorWidget->appendSendingCall("physicallyAddingRemoteModelFailed", aircraft.toQString()); - }, Qt::QueuedConnection)); + }, + Qt::QueuedConnection)); m_connectionGuard.append(connect(this, &ISimulator::airspaceSnapshotHandled, this, [ = ] { if (!m_monitorWidget) return; m_monitorWidget->appendSendingCall("airspaceSnapshotHandled"); - }, Qt::QueuedConnection)); + }, + Qt::QueuedConnection)); } void CSimulatorEmulated::fetchFromInterpolator()