From 3a8f0a17d229f5a161fd8a6666b1a6f3b264ae4c Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sat, 20 Dec 2014 19:02:20 +0100 Subject: [PATCH] refs #358, asserts and fixes in context simulator --- src/blackcore/context_network_empty.h | 3 ++- src/blackcore/context_simulator_impl.cpp | 14 ++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/blackcore/context_network_empty.h b/src/blackcore/context_network_empty.h index 668e4a8dc..f995a488b 100644 --- a/src/blackcore/context_network_empty.h +++ b/src/blackcore/context_network_empty.h @@ -124,7 +124,8 @@ namespace BlackCore virtual BlackMisc::Aviation::CAtcStationList getSelectedAtcStations() const override { logEmptyContextWarning(Q_FUNC_INFO); - return BlackMisc::Aviation::CAtcStationList(); + // normally 2 entries + return BlackMisc::Aviation::CAtcStationList({ BlackMisc::Aviation::CAtcStation(), BlackMisc::Aviation::CAtcStation()}); } //! \copydoc IContextNetwork::getUsers() diff --git a/src/blackcore/context_simulator_impl.cpp b/src/blackcore/context_simulator_impl.cpp index 4f59eab7c..4dfb0c69f 100644 --- a/src/blackcore/context_simulator_impl.cpp +++ b/src/blackcore/context_simulator_impl.cpp @@ -207,7 +207,7 @@ namespace BlackCore connect(airspace, &CAirspaceMonitor::removedAircraft, this, &CContextSimulator::ps_removeRemoteAircraft); 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()); m_simulator->addRemoteAircraft(aircraft, client); } @@ -295,21 +295,15 @@ namespace BlackCore void CContextSimulator::ps_addRemoteAircraft(const CAircraft &remoteAircraft, const CClient &remoteClient) { 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); } -// 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) { Q_ASSERT(this->m_simulator); - if (!this->m_simulator) return; + if (!this->m_simulator) { return; } this->m_simulator->addAircraftSituation(callsign, situation); }