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

Ref T632, more detailled entry check for adding a remote aircraft (finds empty callsign)

Browse Source
This commit is contained in:
Klaus Basan
2019-04-23 18:08:12 +02:00
parent 8fe23b780f
commit 275006dad4
2 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/blackcore/simulator.cpp
View File

@@ -81,9 +81,16 @@ namespace BlackCore
bool ISimulator::logicallyAddRemoteAircraft(const CSimulatedAircraft &remoteAircraft) bool ISimulator::logicallyAddRemoteAircraft(const CSimulatedAircraft &remoteAircraft)
{ {
Q_ASSERT_X(remoteAircraft.hasModelString(), Q_FUNC_INFO, "Missing model string"); if (!this->validateModelOfAircraft(remoteAircraft))
Q_ASSERT_X(remoteAircraft.hasCallsign(), Q_FUNC_INFO, "Missing callsign"); {
const CCallsign cs = remoteAircraft.getCallsign();
CLogMessage(this).warning(u"Invalid aircraft detected, which will be disabled: '%1' '%2'") << cs << remoteAircraft.getModelString();
this->updateAircraftEnabled(cs, false);
this->updateAircraftRendered(cs, false);
return false;
}
// no invalid model should ever reach this place here
const bool renderingRestricted = this->getInterpolationSetupGlobal().isRenderingRestricted(); const bool renderingRestricted = this->getInterpolationSetupGlobal().isRenderingRestricted();
if (this->showDebugLogMessage()) { this->debugLogMessage(Q_FUNC_INFO, QStringLiteral("Restricted: %1 cs: '%2' enabled: %3").arg(boolToYesNo(renderingRestricted), remoteAircraft.getCallsignAsString(), boolToYesNo(remoteAircraft.isEnabled()))); } if (this->showDebugLogMessage()) { this->debugLogMessage(Q_FUNC_INFO, QStringLiteral("Restricted: %1 cs: '%2' enabled: %3").arg(boolToYesNo(renderingRestricted), remoteAircraft.getCallsignAsString(), boolToYesNo(remoteAircraft.isEnabled()))); }
if (!remoteAircraft.isEnabled()) { return false; } if (!remoteAircraft.isEnabled()) { return false; }
@@ -1072,6 +1079,27 @@ namespace BlackCore
return CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance().getCachedModels(simulator); return CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance().getCachedModels(simulator);
} }
bool ISimulator::validateModelOfAircraft(const CSimulatedAircraft &aircraft) const
{
const CAircraftModel model = aircraft.getModel();
if (!aircraft.hasCallsign())
{
CLogMessage(this).warning(u"Missing callsign for '%1'") << aircraft.getModelString();
return false;
}
if (!model.hasModelString())
{
CLogMessage(this).warning(u"No model string for callsign '%1'") << aircraft.getCallsign();
return false;
}
if (model.isCallsignEmpty())
{
CLogMessage(this).warning(u"No callsign for model of aircraft '%1'") << aircraft.getCallsign();
return false;
}
return true;
}
QString ISimulator::latestLoggedDataFormatted(const CCallsign &cs) const QString ISimulator::latestLoggedDataFormatted(const CCallsign &cs) const
{ {
const SituationLog s = m_interpolationLogger.getLastSituationLog(cs); const SituationLog s = m_interpolationLogger.getLastSituationLog(cs);

3
src/blackcore/simulator.h
View File

@@ -538,6 +538,9 @@ namespace BlackCore
//! Get the model set //! Get the model set
BlackMisc::Simulation::CAircraftModelList getModelSet() const; BlackMisc::Simulation::CAircraftModelList getModelSet() const;
//! Validate if model has callsign and such
bool validateModelOfAircraft(const BlackMisc::Simulation::CSimulatedAircraft &aircraft) const;
//! Lookup against DB data //! Lookup against DB data
static BlackMisc::Simulation::CAircraftModel reverseLookupModel(const BlackMisc::Simulation::CAircraftModel &model); static BlackMisc::Simulation::CAircraftModel reverseLookupModel(const BlackMisc::Simulation::CAircraftModel &model);