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

Ref T111, handle SELCAL in simulator context (fix, was missing so far)

Browse Source
This commit is contained in:
Klaus Basan
2017-08-08 02:39:29 +02:00
committed by Mathew Sutcliffe
parent 7cc723c7c3
commit 71fa0fc7b8
3 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -524,6 +524,15 @@ namespace BlackCore
m_simulatorPlugin.second->updateOwnSimulatorCockpit(ownAircraft, originator);
}
void CContextSimulator::ps_updateSimulatorSelcalFromContext(const CSelcal &selcal, const CIdentifier &originator)
{
if (!isSimulatorSimulating()) { return; }
if (originator.getName().isEmpty() || originator == IContextSimulator::InterfaceName()) { return; }
// update
m_simulatorPlugin.second->updateOwnSimulatorSelcal(selcal, originator);
}
void CContextSimulator::ps_networkRequestedNewAircraft(const CCallsign &callsign, const QString &aircraftIcao, const QString &airlineIcao, const QString &livery)
{
if (m_networkSessionId.isEmpty()) { return; }

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

@@ -145,6 +145,9 @@ namespace BlackCore
//! Update simulator cockpit from context, because someone else has changed cockpit (e.g. GUI, 3rd party)
void ps_updateSimulatorCockpitFromContext(const BlackMisc::Simulation::CSimulatedAircraft &ownAircraft, const BlackMisc::CIdentifier &originator);
//! Update simulator SELCAL from context, because someone else has changed cockpit (e.g. GUI, 3rd party)
void ps_updateSimulatorSelcalFromContext(const BlackMisc::Aviation::CSelcal &selcal, const BlackMisc::CIdentifier &originator);
//! Raw data when a new aircraft was requested, used for statistics
void ps_networkRequestedNewAircraft(const BlackMisc::Aviation::CCallsign &callsign, const QString &aircraftIcao, const QString &airlineIcao, const QString &livery);
//! @}

3
src/blackcore/corefacade.cpp
View File

@@ -208,6 +208,9 @@ namespace BlackCore
c = connect(this->m_contextOwnAircraft, &IContextOwnAircraft::changedAircraftCockpit,
this->getCContextSimulator(), &CContextSimulator::ps_updateSimulatorCockpitFromContext);
Q_ASSERT(c);
c = connect(this->m_contextOwnAircraft, &IContextOwnAircraft::changedSelcal,
this->getCContextSimulator(), &CContextSimulator::ps_updateSimulatorSelcalFromContext);
Q_ASSERT(c);
c = connect(this->getCContextSimulator(), &CContextSimulator::ownAircraftModelChanged,
this->getCContextOwnAircraft(), &CContextOwnAircraft::ps_changedSimulatorModel);
Q_ASSERT(c);