flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-19 03:45:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Trigger validation with sim.directory

Browse Source 
Ref T247 follow up
This commit is contained in:
Klaus Basan
2019-04-10 00:56:44 +02:00
committed by Mat Sutcliffe
parent 36381351b9
commit e8ea050882
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/blackcore/context/contextsimulatorimpl.cpp
View File

@@ -304,7 +304,8 @@ namespace BlackCore
{ {
if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; }
if (!m_validator) { return false; } if (!m_validator) { return false; }
return m_validator->triggerValidation(simulator); const QString simDir = simulator.isSingleSimulator() ? m_simulatorSettings.getSimulatorDirectoryOrDefault(simulator) : "";
return m_validator->triggerValidation(simulator, simDir);
} }
CAircraftModelList CContextSimulator::getModelSetModelsStartingWith(const QString &modelString) const CAircraftModelList CContextSimulator::getModelSetModelsStartingWith(const QString &modelString) const

7
src/blackmisc/simulation/backgroundvalidation.cpp
View File

@@ -60,7 +60,7 @@ namespace BlackMisc
return m_simulator; return m_simulator;
} }
bool CBackgroundValidation::triggerValidation(const CSimulatorInfo &simulator) bool CBackgroundValidation::triggerValidation(const CSimulatorInfo &simulator, const QString &simDirectory)
{ {
const QPointer<CBackgroundValidation> myself(this); const QPointer<CBackgroundValidation> myself(this);
if (simulator.isNoSimulator()) if (simulator.isNoSimulator())
@@ -71,7 +71,8 @@ namespace BlackMisc
{ {
QWriteLocker l(&m_lock); QWriteLocker l(&m_lock);
if (m_inWork) { return false; } if (m_inWork) { return false; }
m_simulator = simulator; m_simulator = simulator;
m_simDirectory = simDirectory;
m_checkedSimulatorMsgs.remove(simulator); m_checkedSimulatorMsgs.remove(simulator);
} }
QTimer::singleShot(0, this, [ = ] QTimer::singleShot(0, this, [ = ]
@@ -136,8 +137,8 @@ namespace BlackMisc
const qint64 now = QDateTime::currentMSecsSinceEpoch(); const qint64 now = QDateTime::currentMSecsSinceEpoch();
const qint64 deltaTimeMs = now - started; const qint64 deltaTimeMs = now - started;
msgs.push_back(CStatusMessage(this, CStatusMessage::SeverityInfo, QStringLiteral("Validated in %1ms").arg(deltaTimeMs))); msgs.push_back(CStatusMessage(this, CStatusMessage::SeverityInfo, QStringLiteral("Validated in %1ms").arg(deltaTimeMs)));
msgs.sortBySeverityHighestFirst();
msgs.freezeOrder(); msgs.freezeOrder();
validated = true; validated = true;
QWriteLocker l(&m_lock); QWriteLocker l(&m_lock);

2
src/blackmisc/simulation/backgroundvalidation.h
View File

@@ -61,7 +61,7 @@ namespace BlackMisc
//! Trigger a validation, returns false if "work in progress" //! Trigger a validation, returns false if "work in progress"
//! \threadsafe //! \threadsafe
bool triggerValidation(const CSimulatorInfo &simulator); bool triggerValidation(const CSimulatorInfo &simulator, const QString &simDirectory);
//! Request last results (again), if there are any //! Request last results (again), if there are any
//! \remark emits CBackgroundValidation::validated signal //! \remark emits CBackgroundValidation::validated signal