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

Ref T515, added failover flag for addingRemoteModelFailed

Browse Source 
* adjusted signatures
* renamings and minor style adjustments
This commit is contained in:
Klaus Basan
2019-01-24 12:19:39 +01:00
committed by Mat Sutcliffe
parent f316c63fbe
commit 6470c61d0a
12 changed files with 38 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/blackgui/components/mappingcomponent.cpp
View File

@@ -493,9 +493,10 @@ namespace BlackGui
ui->sp_MappingComponentSplitter->setSizes(newSizes);
}
void CMappingComponent::onAddingRemoteAircraftFailed(const CSimulatedAircraft &aircraft, bool disabled, const CStatusMessage &message)
void CMappingComponent::onAddingRemoteAircraftFailed(const CSimulatedAircraft &aircraft, bool disabled, bool failover, const CStatusMessage &message)
{
this->tokenBucketUpdate();
Q_UNUSED(failover);
Q_UNUSED(aircraft);
Q_UNUSED(message);
Q_UNUSED(disabled);

2
src/blackgui/components/mappingcomponent.h
View File

@@ -144,7 +144,7 @@ namespace BlackGui
void showAircraftModelDetails(bool show);
//! Adding a remote aircraft failed
void onAddingRemoteAircraftFailed(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, bool disabled, const BlackMisc::CStatusMessage &message);
void onAddingRemoteAircraftFailed(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, bool disabled, bool failover, const BlackMisc::CStatusMessage &message);
//! Timer update
void timerUpdate();

6
src/blackgui/components/simulatorcomponent.cpp
View File

@@ -183,9 +183,11 @@ namespace BlackGui
}
}
void CSimulatorComponent::onAddingRemoteModelFailed(const CSimulatedAircraft &aircraft, bool disabled, const CStatusMessage &message)
void CSimulatorComponent::onAddingRemoteModelFailed(const CSimulatedAircraft &aircraft, bool disabled, bool failover, const CStatusMessage &message)
{
ui->comp_StatusMessages->appendStatusMessageToList(CStatusMessage(this).warning(u"Adding model failed, disabled: %1: '%2'") << boolToYesNo(disabled) << aircraft.toQString(true));
ui->comp_StatusMessages->appendStatusMessageToList(CStatusMessage(this).
warning(u"Adding model '%1' failed, disabled: %2: failover: %3 detials: %4")
<< aircraft.getModelString() << boolToYesNo(disabled) << boolToYesNo(failover) << aircraft.toQString(true));
ui->comp_StatusMessages->appendStatusMessageToList(message);
}

2
src/blackgui/components/simulatorcomponent.h
View File

@@ -67,7 +67,7 @@ namespace BlackGui
void onSimulatorStatusChanged(int status);
//! \copydoc ISimulator::addingRemoteModelFailed
void onAddingRemoteModelFailed(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, bool disabled, const BlackMisc::CStatusMessage &message);
void onAddingRemoteModelFailed(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, bool disabled, bool failover, const BlackMisc::CStatusMessage &message);
//! \copydoc ISimulator::onSimulatorMessages
void onSimulatorMessages(const BlackMisc::CStatusMessageList &messages);