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

Ref T786, simulator context

Browse Source 
* use identifier based "requestWeatherGrid"
* injectWeatherGrid now public
* clean m_lastWeatherPosition if weather is de-activated
* inject weather CContextSimulator::onWeatherGridReceived

1) this automatically injects the weather, the callback is not needed
2) the callback was the part which crashed
This commit is contained in:
Klaus Basan
2020-04-19 02:34:15 +02:00
committed by Mat Sutcliffe
parent e7875c3af8
commit 58583d3ffa
8 changed files with 69 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,7 +77,8 @@ namespace BlackCore
m_plugins->collectPlugins();
this->restoreSimulatorPlugins();
connect(&m_weatherManager, &CWeatherManager::weatherGridReceived, this, &CContextSimulator::weatherGridReceived, Qt::QueuedConnection);
connect(&m_weatherManager, &CWeatherManager::weatherGridReceived, this, &CContextSimulator::weatherGridReceived, Qt::QueuedConnection);
connect(&m_weatherManager, &CWeatherManager::weatherGridReceived, this, &CContextSimulator::onWeatherGridReceived, Qt::QueuedConnection);
connect(&m_aircraftMatcher, &CAircraftMatcher::setupChanged, this, &CContextSimulator::matchingSetupChanged);
connect(&CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance(), &CCentralMultiSimulatorModelSetCachesProvider::cacheChanged, this, &CContextSimulator::modelSetChanged);
@@ -870,6 +871,16 @@ namespace BlackCore
emit this->addingRemoteModelFailed(remoteAircraft, disabled, failover, message);
}
void CContextSimulator::onWeatherGridReceived(const CWeatherGrid &weatherGrid, const CIdentifier &identifier)
{
if (!this->isSimulatorPluginAvailable()) { return; }
if (!m_simulatorPlugin.second) { return; }
if (m_simulatorPlugin.second->identifier() == identifier)
{
m_simulatorPlugin.second->injectWeatherGrid(weatherGrid);
}
}
void CContextSimulator::xCtxUpdateSimulatorCockpitFromContext(const CSimulatedAircraft &ownAircraft, const CIdentifier &originator)
{
if (!this->isSimulatorAvailable()) { return; }
@@ -1141,10 +1152,10 @@ namespace BlackCore
m_simulatorPlugin.second->setWeatherActivated(activated);
}
void CContextSimulator::requestWeatherGrid(const CWeatherGrid &weatherGrid, const CIdentifier &identifier)
void CContextSimulator::requestWeatherGrid(const CCoordinateGeodetic &position, const CIdentifier &identifier)
{
if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << identifier; }
m_weatherManager.requestWeatherGrid(weatherGrid, identifier);
m_weatherManager.requestWeatherGrid(position, identifier);
}
bool CContextSimulator::requestElevationBySituation(const CAircraftSituation &situation)
@@ -1240,7 +1251,7 @@ namespace BlackCore
{
const bool s = QMetaObject::invokeMethod(listener, &ISimulatorListener::stop);
Q_ASSERT_X(s, Q_FUNC_INFO, "Cannot invoke stop");
Q_UNUSED(s);
Q_UNUSED(s)
}
}
}