flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-06 10:15:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T515, context function "isValidationInProgress"

Browse Source
This commit is contained in:
Klaus Basan
2019-01-23 21:32:22 +01:00
committed by Mat Sutcliffe
parent 2dd396c0df
commit 0ac6739377
7 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/blackcore/context/contextsimulator.h
View File

@@ -206,6 +206,9 @@ namespace BlackCore
//! \copydoc CAircraftMatcher::getDisabledModelsForMatching
virtual BlackMisc::Simulation::CAircraftModelList getDisabledModelsForMatching() const = 0;
//! \copydoc BlackMisc::Simulation::CBackgroundValidation::isValidating
virtual bool isValidationInProgress() const = 0;
//! Trigger model set validation
virtual bool triggerModelSetValidation(const BlackMisc::Simulation::CSimulatorInfo &simulator) = 0;

7
src/blackcore/context/contextsimulatorempty.h
View File

@@ -161,6 +161,13 @@ namespace BlackCore
return false;
}
//! \copydoc BlackMisc::Simulation::CBackgroundValidation::isValidating
virtual bool isValidationInProgress() const override
{
logEmptyContextWarning(Q_FUNC_INFO);
return false;
}
//! \copydoc IContextSimulator::isKnownModelInSet
virtual bool isKnownModelInSet(const QString &modelstring) const override
{

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

@@ -279,8 +279,16 @@ namespace BlackCore
m_aircraftMatcher.restoreDisabledModels();
}
bool CContextSimulator::isValidationInProgress() const
{
if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; }
if (!m_validator) { return false; }
return m_validator->isValidating();
}
bool CContextSimulator::triggerModelSetValidation(const CSimulatorInfo &simulator)
{
if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; }
if (!m_validator) { return false; }
return m_validator->triggerValidation(simulator);
}

1
src/blackcore/context/contextsimulatorimpl.h
View File

@@ -95,6 +95,7 @@ namespace BlackCore
virtual void disableModelsForMatching(const BlackMisc::Simulation::CAircraftModelList &removedModels, bool incremental) override;
virtual BlackMisc::Simulation::CAircraftModelList getDisabledModelsForMatching() const override;
virtual void restoreDisabledModels() override;
virtual bool isValidationInProgress() const override;
virtual bool triggerModelSetValidation(const BlackMisc::Simulation::CSimulatorInfo &simulator) override;
virtual BlackMisc::Simulation::CAircraftModelList getModelSetModelsStartingWith(const QString &modelString) const override;
virtual BlackMisc::PhysicalQuantities::CTime getTimeSynchronizationOffset() const override;

5
src/blackcore/context/contextsimulatorproxy.cpp
View File

@@ -190,6 +190,11 @@ namespace BlackCore
return m_dBusInterface->callDBusRet<bool>(QLatin1String("triggerModelSetValidation"), simulator);
}
bool CContextSimulatorProxy::isValidationInProgress() const
{
return m_dBusInterface->callDBusRet<bool>(QLatin1String("isValidationInProgress"));
}
void CContextSimulatorProxy::restoreDisabledModels()
{
m_dBusInterface->callDBus(QLatin1String("restoreDisabledModels"));

1
src/blackcore/context/contextsimulatorproxy.h
View File

@@ -79,6 +79,7 @@ namespace BlackCore
virtual void disableModelsForMatching(const BlackMisc::Simulation::CAircraftModelList &removedModels, bool incremental) override;
virtual BlackMisc::Simulation::CAircraftModelList getDisabledModelsForMatching() const override;
virtual bool triggerModelSetValidation(const BlackMisc::Simulation::CSimulatorInfo &simulator) override;
virtual bool isValidationInProgress() const override;
virtual void restoreDisabledModels() override;
virtual bool setTimeSynchronization(bool enable, const BlackMisc::PhysicalQuantities::CTime &offset) override;
virtual bool isTimeSynchronized() const override;

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

@@ -48,6 +48,10 @@ namespace BlackMisc
//! \threadsafe
bool wasAlreadyChecked(const CSimulatorInfo &simulator) const;
//! Validation in progress
//! \threadsafe
bool isValidating() const { return m_inWork; }
//! Reset checked for simulator
//! \threadsafe
void resetAlreadyChecked(const CSimulatorInfo &simulator);