Ref T259, Ref T243 setSimulationEnvironmentProvider when simulator changes

This commit is contained in:
Klaus Basan
2018-03-07 02:11:34 +01:00
parent 4dfb973a5b
commit d7ac721d09
4 changed files with 33 additions and 3 deletions

View File

@@ -456,7 +456,7 @@ namespace BlackCore
sim->disconnect(this);
sim->unload();
sim->deleteLater();
emit simulatorPluginChanged(CSimulatorPluginInfo());
emit this->simulatorPluginChanged(CSimulatorPluginInfo());
}
}
}
@@ -475,7 +475,7 @@ namespace BlackCore
CStatusMessageList *pMatchingMessages = m_enableMatchingMessages ? &matchingMessages : nullptr;
const CAircraftModel aircraftModel = m_aircraftMatcher.getClosestMatch(remoteAircraft, pMatchingMessages);
Q_ASSERT_X(remoteAircraft.getCallsign() == aircraftModel.getCallsign(), Q_FUNC_INFO, "Mismatching callsigns");
updateAircraftModel(callsign, aircraftModel, identifier());
this->updateAircraftModel(callsign, aircraftModel, identifier());
const CSimulatedAircraft aircraftAfterModelApplied = getAircraftInRangeForCallsign(remoteAircraft.getCallsign());
m_simulatorPlugin.second->logicallyAddRemoteAircraft(aircraftAfterModelApplied);
CMatchingUtils::addLogDetailsToList(pMatchingMessages, callsign, QString("Logically added remote aircraft: %1").arg(aircraftAfterModelApplied.toQString()));
@@ -730,6 +730,12 @@ namespace BlackCore
return false;
}
ISimulator *CContextSimulator::simulator() const
{
if (!this->isSimulatorAvailable()) { return nullptr; }
return m_simulatorPlugin.second;
}
void CContextSimulator::highlightAircraft(const CSimulatedAircraft &aircraftToHighlight, bool enableHighlight, const CTime &displayTime)
{
if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << aircraftToHighlight << enableHighlight << displayTime; }