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

Ref T632, verify empty callsign

Browse Source 
THis is the fix:
"if (!simulatedAircraft.hasCallsign()) { continue; } // removed in provider"
This commit is contained in:
Klaus Basan
2019-04-25 00:04:17 +02:00
parent d32e596c89
commit 94a5741537
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/simulator/xplane/simulatorxplane.cpp
View File

@@ -146,7 +146,7 @@ namespace BlackSimPlugin
CStatusMessageList CSimulatorXPlane::getInterpolationMessages(const CCallsign &callsign) const CStatusMessageList CSimulatorXPlane::getInterpolationMessages(const CCallsign &callsign) const
{ {
if (!m_xplaneAircraftObjects.contains(callsign)) { return CStatusMessageList(); } if (callsign.isEmpty() || !m_xplaneAircraftObjects.contains(callsign)) { return CStatusMessageList(); }
const CInterpolationAndRenderingSetupPerCallsign setup = this->getInterpolationSetupConsolidated(callsign, false); const CInterpolationAndRenderingSetupPerCallsign setup = this->getInterpolationSetupConsolidated(callsign, false);
return m_xplaneAircraftObjects[callsign].getInterpolationMessages(setup.getInterpolatorMode()); return m_xplaneAircraftObjects[callsign].getInterpolationMessages(setup.getInterpolatorMode());
} }
@@ -311,7 +311,8 @@ namespace BlackSimPlugin
for (CXPlaneMPAircraft &xplaneAircraft : m_xplaneAircraftObjects) for (CXPlaneMPAircraft &xplaneAircraft : m_xplaneAircraftObjects)
{ {
// Update remote aircraft to have the latest transponder modes, codes etc. // Update remote aircraft to have the latest transponder modes, codes etc.
CSimulatedAircraft simulatedAircraft = this->getAircraftInRangeForCallsign(xplaneAircraft.getCallsign()); const CSimulatedAircraft simulatedAircraft = this->getAircraftInRangeForCallsign(xplaneAircraft.getCallsign());
if (!simulatedAircraft.hasCallsign()) { continue; } // removed in provider
xplaneAircraft.setSimulatedAircraft(simulatedAircraft); xplaneAircraft.setSimulatedAircraft(simulatedAircraft);
} }
} }
@@ -954,9 +955,15 @@ namespace BlackSimPlugin
const CCallsignSet logCallsigns = this->getLogCallsigns(); const CCallsignSet logCallsigns = this->getLogCallsigns();
for (int i = 0; i < size; i++) for (int i = 0; i < size; i++)
{ {
const bool emptyCs = callsigns[i].isEmpty();
BLACK_VERIFY_X(!emptyCs, Q_FUNC_INFO, "Need callsign");
if (emptyCs) { continue; }
const CCallsign cs(callsigns[i]); const CCallsign cs(callsigns[i]);
if (!m_xplaneAircraftObjects.contains(cs)) { continue; } if (!m_xplaneAircraftObjects.contains(cs)) { continue; }
const CXPlaneMPAircraft xpAircraft = m_xplaneAircraftObjects[cs]; const CXPlaneMPAircraft xpAircraft = m_xplaneAircraftObjects[cs];
BLACK_VERIFY_X(xpAircraft.hasCallsign(), Q_FUNC_INFO, "Need callsign");
if (!xpAircraft.hasCallsign()) { continue; }
const double cgValue = verticalOffsetsMeters[i]; // XP offset is swift CG const double cgValue = verticalOffsetsMeters[i]; // XP offset is swift CG
const CAltitude elevationAlt(elevationsMeters[i], CLengthUnit::m(), CLengthUnit::ft()); const CAltitude elevationAlt(elevationsMeters[i], CLengthUnit::m(), CLengthUnit::ft());
@@ -993,6 +1000,8 @@ namespace BlackSimPlugin
void CSimulatorXPlane::onRemoteAircraftAdded(const QString &callsign) void CSimulatorXPlane::onRemoteAircraftAdded(const QString &callsign)
{ {
BLACK_VERIFY_X(!callsign.isEmpty(), Q_FUNC_INFO, "Need callsign");
if (callsign.isEmpty()) { return; }
const CCallsign cs(callsign); const CCallsign cs(callsign);
CSimulatedAircraft addedRemoteAircraft = this->getAircraftInRangeForCallsign(cs); CSimulatedAircraft addedRemoteAircraft = this->getAircraftInRangeForCallsign(cs);
@@ -1029,13 +1038,16 @@ namespace BlackSimPlugin
this->triggerRequestRemoteAircraftDataFromXPlane(cs); this->triggerRequestRemoteAircraftDataFromXPlane(cs);
this->triggerAddNextPendingAircraft(); this->triggerAddNextPendingAircraft();
m_xplaneAircraftObjects.insert(addedRemoteAircraft.getCallsign(), CXPlaneMPAircraft(addedRemoteAircraft, this, &m_interpolationLogger)); Q_ASSERT_X(addedRemoteAircraft.hasCallsign(), Q_FUNC_INFO, "No callsign"); // already checked above, MUST never happen
Q_ASSERT_X(addedRemoteAircraft.getCallsign() == cs, Q_FUNC_INFO, "No callsign"); // already checked above, MUST never happen
m_xplaneAircraftObjects.insert(cs, CXPlaneMPAircraft(addedRemoteAircraft, this, &m_interpolationLogger));
emit this->aircraftRenderingChanged(addedRemoteAircraft); emit this->aircraftRenderingChanged(addedRemoteAircraft);
} }
void CSimulatorXPlane::onRemoteAircraftAddingFailed(const QString &callsign) void CSimulatorXPlane::onRemoteAircraftAddingFailed(const QString &callsign)
{ {
BLACK_VERIFY_X(!callsign.isEmpty(), Q_FUNC_INFO, "Need callsign");
if (callsign.isEmpty()) { return; }
const CCallsign cs(callsign); const CCallsign cs(callsign);
CSimulatedAircraft failedRemoteAircraft = this->getAircraftInRangeForCallsign(cs); CSimulatedAircraft failedRemoteAircraft = this->getAircraftInRangeForCallsign(cs);

3
src/plugins/simulator/xplane/xplanempaircraft.h
View File

@@ -42,6 +42,9 @@ namespace BlackSimPlugin
//! Get callsign //! Get callsign
const BlackMisc::Aviation::CCallsign &getCallsign() const { return m_aircraft.getCallsign(); } const BlackMisc::Aviation::CCallsign &getCallsign() const { return m_aircraft.getCallsign(); }
//! Has callsign
bool hasCallsign() const { return m_aircraft.hasCallsign(); }
//! Simulated aircraft (as added) //! Simulated aircraft (as added)
const BlackMisc::Simulation::CSimulatedAircraft &getAircraft() const { return m_aircraft; } const BlackMisc::Simulation::CSimulatedAircraft &getAircraft() const { return m_aircraft; }