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

Ref T515, functions for matcher setting/getting disabled models

Browse Source
This commit is contained in:
Klaus Basan
2019-01-22 21:35:08 +01:00
committed by Mat Sutcliffe
parent da92f3885c
commit faddf40ba7
7 changed files with 51 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/blackcore/aircraftmatcher.h
View File

@@ -193,6 +193,9 @@ namespace BlackCore
//! \remark effective until new set is set
void disableModelsForMatching(const BlackMisc::Simulation::CAircraftModelList &removedModels, bool incremental);
//! The disabled models for matching
BlackMisc::Simulation::CAircraftModelList getDisabledModelsForMatching() const { return m_disabledModels; }
//! Restore the models removed with CAircraftMatcher::disableModelForMatching
void restoreDisabledModels();

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

@@ -203,6 +203,12 @@ namespace BlackCore
//! \copydoc CAircraftMatcher::disableModelsForMatching
virtual void disableModelsForMatching(const BlackMisc::Simulation::CAircraftModelList &removedModels, bool incremental) = 0;
//! \copydoc CAircraftMatcher::getDisabledModelsForMatching
virtual BlackMisc::Simulation::CAircraftModelList getDisabledModelsForMatching() const = 0;
//! Trigger model set validation
virtual bool triggerModelSetValidation(const BlackMisc::Simulation::CSimulatorInfo &simulator) = 0;
//! \copydoc CAircraftMatcher::restoreDisabledModels
virtual void restoreDisabledModels() = 0;

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

@@ -140,12 +140,27 @@ namespace BlackCore
Q_UNUSED(incremental);
}
//! \copydoc CAircraftMatcher::getDisabledModelsForMatching
virtual BlackMisc::Simulation::CAircraftModelList getDisabledModelsForMatching() const override
{
logEmptyContextWarning(Q_FUNC_INFO);
return BlackMisc::Simulation::CAircraftModelList();
}
//! \copydoc CAircraftMatcher::restoreDisabledModels
virtual void restoreDisabledModels() override
{
logEmptyContextWarning(Q_FUNC_INFO);
}
//! \copydoc BlackMisc::Simulation::CBackgroundValidation::triggerValidation
virtual bool triggerModelSetValidation(const BlackMisc::Simulation::CSimulatorInfo &simulator) override
{
logEmptyContextWarning(Q_FUNC_INFO);
Q_UNUSED(simulator);
return false;
}
//! \copydoc IContextSimulator::isKnownModel
virtual bool isKnownModel(const QString &modelstring) const override
{

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

@@ -265,6 +265,13 @@ namespace BlackCore
m_aircraftMatcher.disableModelsForMatching(removedModels, incremental);
}
CAircraftModelList CContextSimulator::getDisabledModelsForMatching() const
{
if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; }
if (!m_simulatorPlugin.second || m_simulatorPlugin.first.isUnspecified()) { return CAircraftModelList(); }
return m_aircraftMatcher.getDisabledModelsForMatching();
}
void CContextSimulator::restoreDisabledModels()
{
if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; }
@@ -272,6 +279,12 @@ namespace BlackCore
m_aircraftMatcher.restoreDisabledModels();
}
bool CContextSimulator::triggerModelSetValidation(const CSimulatorInfo &simulator)
{
if (!m_validator) { return false; }
return m_validator->triggerValidation(simulator);
}
CAircraftModelList CContextSimulator::getModelSetModelsStartingWith(const QString &modelString) const
{
if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << modelString; }

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

@@ -93,7 +93,9 @@ namespace BlackCore
virtual bool isKnownModel(const QString &modelString) const override;
virtual int getModelSetCount() const override;
virtual void disableModelsForMatching(const BlackMisc::Simulation::CAircraftModelList &removedModels, bool incremental) override;
virtual BlackMisc::Simulation::CAircraftModelList getDisabledModelsForMatching() const override;
virtual void restoreDisabledModels() 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;
virtual bool setTimeSynchronization(bool enable, const BlackMisc::PhysicalQuantities::CTime &offset) override;

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

@@ -180,6 +180,16 @@ namespace BlackCore
m_dBusInterface->callDBus(QLatin1String("disableModelsForMatching"), removedModels, incremental);
}
CAircraftModelList CContextSimulatorProxy::getDisabledModelsForMatching() const
{
return m_dBusInterface->callDBusRet<BlackMisc::Simulation::CAircraftModelList>(QLatin1String("getDisabledModelsForMatching"));
}
bool CContextSimulatorProxy::triggerModelSetValidation(const CSimulatorInfo &simulator)
{
return m_dBusInterface->callDBusRet<bool>(QLatin1String("triggerModelSetValidation"), simulator);
}
void CContextSimulatorProxy::restoreDisabledModels()
{
m_dBusInterface->callDBus(QLatin1String("restoreDisabledModels"));

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

@@ -77,6 +77,8 @@ namespace BlackCore
virtual int getModelSetCount() const override;
virtual BlackMisc::Simulation::CSimulatorInternals getSimulatorInternals() const override;
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 void restoreDisabledModels() override;
virtual bool setTimeSynchronization(bool enable, const BlackMisc::PhysicalQuantities::CTime &offset) override;
virtual bool isTimeSynchronized() const override;