Ref T451, disable model (in model set) functions for context

This commit is contained in:
Klaus Basan
2018-12-24 07:03:03 +01:00
committed by Mat Sutcliffe
parent 7f9182a1c4
commit 0970dbdcfc
6 changed files with 50 additions and 2 deletions

View File

@@ -192,6 +192,12 @@ namespace BlackCore
//! Model set completer string
virtual QStringList getModelSetCompleterStrings(bool sorted) const = 0;
//! \copydoc CAircraftMatcher::disableModelsForMatching
virtual void disableModelsForMatching(const BlackMisc::Simulation::CAircraftModelList &removedModels, bool incremental) = 0;
//! \copydoc CAircraftMatcher::restoreDisabledModels
virtual void restoreDisabledModels() = 0;
//! Known model?
virtual bool isKnownModel(const QString &modelstring) const = 0;

View File

@@ -132,6 +132,20 @@ namespace BlackCore
return QStringList();
}
//! \copydoc CAircraftMatcher::disableModelsForMatching
virtual void disableModelsForMatching(const BlackMisc::Simulation::CAircraftModelList &removedModels, bool incremental) override
{
logEmptyContextWarning(Q_FUNC_INFO);
Q_UNUSED(removedModels);
Q_UNUSED(incremental);
}
//! \copydoc CAircraftMatcher::restoreDisabledModels
virtual void restoreDisabledModels() override
{
logEmptyContextWarning(Q_FUNC_INFO);
}
//! \copydoc IContextSimulator::isKnownModel
virtual bool isKnownModel(const QString &modelstring) const override
{

View File

@@ -244,6 +244,20 @@ namespace BlackCore
return this->getModelSet().size();
}
void CContextSimulator::disableModelsForMatching(const CAircraftModelList &removedModels, bool incremental)
{
if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; }
if (!m_simulatorPlugin.second || m_simulatorPlugin.first.isUnspecified()) { return; }
m_aircraftMatcher.disableModelsForMatching(removedModels, incremental);
}
void CContextSimulator::restoreDisabledModels()
{
if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; }
if (!m_simulatorPlugin.second || m_simulatorPlugin.first.isUnspecified()) { return; }
m_aircraftMatcher.restoreDisabledModels();
}
CAircraftModelList CContextSimulator::getModelSetModelsStartingWith(const QString &modelString) const
{
if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << modelString; }

View File

@@ -91,6 +91,8 @@ namespace BlackCore
virtual QStringList getModelSetCompleterStrings(bool sorted) const override;
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 void restoreDisabledModels() 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;

View File

@@ -169,6 +169,16 @@ namespace BlackCore
return m_dBusInterface->callDBusRet<BlackMisc::Simulation::CSimulatorInternals>(QLatin1String("getSimulatorInternals"));
}
void CContextSimulatorProxy::disableModelsForMatching(const CAircraftModelList &removedModels, bool incremental)
{
m_dBusInterface->callDBus(QLatin1String("disableModelsForMatching"), removedModels, incremental);
}
void CContextSimulatorProxy::restoreDisabledModels()
{
m_dBusInterface->callDBus(QLatin1String("restoreDisabledModels"));
}
bool CContextSimulatorProxy::setTimeSynchronization(bool enable, const CTime &offset)
{
return m_dBusInterface->callDBusRet<bool>(QLatin1String("setTimeSynchronization"), enable, offset);
@@ -214,12 +224,12 @@ namespace BlackCore
return m_dBusInterface->callDBusRet<BlackMisc::PhysicalQuantities::CTime>(QLatin1String("getTimeSynchronizationOffset"));
}
bool CContextSimulatorProxy::startSimulatorPlugin(const BlackMisc::Simulation::CSimulatorPluginInfo &simulatorInfo)
bool CContextSimulatorProxy::startSimulatorPlugin(const CSimulatorPluginInfo &simulatorInfo)
{
return m_dBusInterface->callDBusRet<bool>(QLatin1String("startSimulatorPlugin"), simulatorInfo);
}
void CContextSimulatorProxy::stopSimulatorPlugin(const BlackMisc::Simulation::CSimulatorPluginInfo &simulatorInfo)
void CContextSimulatorProxy::stopSimulatorPlugin(const CSimulatorPluginInfo &simulatorInfo)
{
m_dBusInterface->callDBus(QLatin1String("stopSimulatorPlugin"), simulatorInfo);
}

View File

@@ -76,6 +76,8 @@ namespace BlackCore
virtual BlackMisc::Simulation::CAircraftModelList getModelSetModelsStartingWith(const QString &modelString) const override;
virtual int getModelSetCount() const override;
virtual BlackMisc::Simulation::CSimulatorInternals getSimulatorInternals() const override;
virtual void disableModelsForMatching(const BlackMisc::Simulation::CAircraftModelList &removedModels, bool incremental) override;
virtual void restoreDisabledModels() override;
virtual bool setTimeSynchronization(bool enable, const BlackMisc::PhysicalQuantities::CTime &offset) override;
virtual bool isTimeSynchronized() const override;
virtual BlackMisc::Simulation::CInterpolationAndRenderingSetupGlobal getInterpolationAndRenderingSetupGlobal() const override;