flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 14:55:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Check for known model so mapping component can check without loaded model set

Browse Source
This commit is contained in:
Klaus Basan
2018-09-11 03:44:03 +02:00
parent 7613ec9219
commit e1ffa49268
7 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -187,6 +187,9 @@ namespace BlackCore
//! Model set completer string
virtual QStringList getModelSetCompleterStrings(bool sorted) const = 0;
//! Known model?
virtual bool isKnownModel(const QString &modelstring) const = 0;
//! Set time synchronization between simulator and user's computer time
//! \remarks not all drivers implement this, e.g. if it is an intrinsic simulator feature
virtual bool setTimeSynchronization(bool enable, const BlackMisc::PhysicalQuantities::CTime &offset) = 0;

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

@@ -130,6 +130,14 @@ namespace BlackCore
return QStringList();
}
//! \copydoc IContextSimulator::isKnownModel
virtual bool isKnownModel(const QString &modelstring) const override
{
Q_UNUSED(modelstring);
logEmptyContextWarning(Q_FUNC_INFO);
return false;
}
//! \copydoc IContextSimulator::getModelSetModelsStartingWith
virtual BlackMisc::Simulation::CAircraftModelList getModelSetModelsStartingWith(const QString &modelString) const override
{

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

@@ -247,6 +247,13 @@ namespace BlackCore
return this->getModelSet().getModelStringList(false);
}
bool CContextSimulator::isKnownModel(const QString &modelString) const
{
if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; }
const bool known = this->getModelSet().containsModelString(modelString);
return known;
}
QStringList CContextSimulator::getModelSetCompleterStrings(bool sorted) const
{
if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << sorted; }

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

@@ -86,6 +86,7 @@ namespace BlackCore
virtual BlackMisc::CStatusMessageList verifyPrerequisites() const override;
virtual QStringList getModelSetStrings() const override;
virtual QStringList getModelSetCompleterStrings(bool sorted) const override;
virtual bool isKnownModel(const QString &modelString) const override;
virtual int getModelSetCount() const 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

@@ -141,6 +141,11 @@ namespace BlackCore
return m_dBusInterface->callDBusRet<QStringList>(QLatin1String("getModelSetCompleterStrings"), sorted);
}
bool CContextSimulatorProxy::isKnownModel(const QString &modelString) const
{
return m_dBusInterface->callDBusRet<bool>(QLatin1String("isKnownModel"), modelString);
}
CAircraftModelList CContextSimulatorProxy::getModelSetModelsStartingWith(const QString &modelString) const
{
return m_dBusInterface->callDBusRet<BlackMisc::Simulation::CAircraftModelList>(QLatin1String("getModelSetModelsStartingWith"), modelString);

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

@@ -70,6 +70,7 @@ namespace BlackCore
virtual void setModelSetLoaderSimulator(const BlackMisc::Simulation::CSimulatorInfo &simulator) override;
virtual QStringList getModelSetStrings() const override;
virtual QStringList getModelSetCompleterStrings(bool sorted) const override;
virtual bool isKnownModel(const QString &modelString) const override;
virtual BlackMisc::Simulation::CAircraftModelList getModelSetModelsStartingWith(const QString &modelString) const override;
virtual int getModelSetCount() const override;
virtual BlackMisc::Simulation::CSimulatorInternals getSimulatorInternals() const override;

12
src/blackgui/components/mappingcomponent.cpp
View File

@@ -304,7 +304,7 @@ namespace BlackGui
void CMappingComponent::onSaveAircraft()
{
if (!sGui->getIContextSimulator()->isSimulatorSimulating()) { return; }
if (!sGui || !sGui->getIContextSimulator() || !sGui->getIContextSimulator()->isSimulatorSimulating()) { return; }
const CCallsign callsign(this->validateRenderedCallsign());
if (callsign.isEmpty()) { return; }
const QString modelString = ui->completer_ModelStrings->getModelString();
@@ -314,7 +314,13 @@ namespace BlackGui
return;
}
const bool hasModel = ui->tvp_AircraftModels->container().containsModelString(modelString);
// model in current view (data already in UI)
bool hasModel = ui->tvp_AircraftModels->container().containsModelString(modelString);
if (!hasModel && sGui && sGui->getIContextSimulator())
{
hasModel = sGui->getIContextSimulator()->isKnownModel(modelString);
}
if (!hasModel)
{
this->showOverlayMessage(CStatusMessage(this).validationError("Invalid model for mapping, reloading model set"), OverlayMessageMs);
@@ -328,6 +334,8 @@ namespace BlackGui
const CSimulatedAircraft aircraftFromBackend = sGui->getIContextNetwork()->getAircraftInRangeForCallsign(callsign);
const bool enabled = ui->cb_AircraftEnabled->isChecked();
bool changed = false;
// changed model?
if (aircraftFromBackend.getModelString() != modelString)
{
const CAircraftModelList models = sGui->getIContextSimulator()->getModelSetModelsStartingWith(modelString);