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

refs #358, asserts and fixes in context simulator

Browse Source
This commit is contained in:
Klaus Basan
2014-12-20 19:02:20 +01:00
parent 21135d5370
commit 3a8f0a17d2
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/blackcore/context_network_empty.h
View File

@@ -124,7 +124,8 @@ namespace BlackCore
virtual BlackMisc::Aviation::CAtcStationList getSelectedAtcStations() const override virtual BlackMisc::Aviation::CAtcStationList getSelectedAtcStations() const override
{ {
logEmptyContextWarning(Q_FUNC_INFO); logEmptyContextWarning(Q_FUNC_INFO);
return BlackMisc::Aviation::CAtcStationList(); // normally 2 entries
return BlackMisc::Aviation::CAtcStationList({ BlackMisc::Aviation::CAtcStation(), BlackMisc::Aviation::CAtcStation()});
} }
//! \copydoc IContextNetwork::getUsers() //! \copydoc IContextNetwork::getUsers()

14
src/blackcore/context_simulator_impl.cpp
View File

@@ -207,7 +207,7 @@ namespace BlackCore
connect(airspace, &CAirspaceMonitor::removedAircraft, this, &CContextSimulator::ps_removeRemoteAircraft); connect(airspace, &CAirspaceMonitor::removedAircraft, this, &CContextSimulator::ps_removeRemoteAircraft);
for (const auto &aircraft : airspace->getAircraftInRange()) for (const auto &aircraft : airspace->getAircraftInRange())
{ {
// m_simulator->addRemoteAircraft(aircraft.getCallsign(), aircraft.getSituation()); Q_ASSERT(!aircraft.getCallsign().isEmpty());
CClient client = airspace->getOtherClients().findFirstByCallsign(aircraft.getCallsign()); CClient client = airspace->getOtherClients().findFirstByCallsign(aircraft.getCallsign());
m_simulator->addRemoteAircraft(aircraft, client); m_simulator->addRemoteAircraft(aircraft, client);
} }
@@ -295,21 +295,15 @@ namespace BlackCore
void CContextSimulator::ps_addRemoteAircraft(const CAircraft &remoteAircraft, const CClient &remoteClient) void CContextSimulator::ps_addRemoteAircraft(const CAircraft &remoteAircraft, const CClient &remoteClient)
{ {
Q_ASSERT(this->m_simulator); Q_ASSERT(this->m_simulator);
if (!this->m_simulator) return; Q_ASSERT(!remoteAircraft.getCallsign().isEmpty());
if (!this->m_simulator) { return; }
this->m_simulator->addRemoteAircraft(remoteAircraft, remoteClient); this->m_simulator->addRemoteAircraft(remoteAircraft, remoteClient);
} }
// void CContextSimulator::ps_addRemoteAircraft(const CCallsign &callsign, const CAircraftSituation &initialSituation)
// {
// Q_ASSERT(this->m_simulator);
// if (!this->m_simulator) return;
// this->m_simulator->addRemoteAircraft(callsign, initialSituation);
// }
void CContextSimulator::ps_addAircraftSituation(const CCallsign &callsign, const CAircraftSituation &situation) void CContextSimulator::ps_addAircraftSituation(const CCallsign &callsign, const CAircraftSituation &situation)
{ {
Q_ASSERT(this->m_simulator); Q_ASSERT(this->m_simulator);
if (!this->m_simulator) return; if (!this->m_simulator) { return; }
this->m_simulator->addAircraftSituation(callsign, situation); this->m_simulator->addAircraftSituation(callsign, situation);
} }