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

Ref T322, ATC station distance can be recalculated when getting ATC stations from network context

Browse Source
This commit is contained in:
Klaus Basan
2018-09-03 13:40:41 +02:00
committed by Roland Winklmeier
parent cacbe6e996
commit f3f2fa664e
6 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackcore/context/contextnetwork.h
View File

@@ -172,10 +172,10 @@ namespace BlackCore
virtual void requestAtcBookingsUpdate() const = 0; virtual void requestAtcBookingsUpdate() const = 0;
//! The ATC list with online ATC controllers //! The ATC list with online ATC controllers
virtual BlackMisc::Aviation::CAtcStationList getAtcStationsOnline() const = 0; virtual BlackMisc::Aviation::CAtcStationList getAtcStationsOnline(bool recalculateDistance) const = 0;
//! ATC list, with booked controllers //! ATC list, with booked controllers
virtual BlackMisc::Aviation::CAtcStationList getAtcStationsBooked() const = 0; virtual BlackMisc::Aviation::CAtcStationList getAtcStationsBooked(bool recalculateDistance) const = 0;
//! Aircraft list //! Aircraft list
virtual BlackMisc::Simulation::CSimulatedAircraftList getAircraftInRange() const = 0; virtual BlackMisc::Simulation::CSimulatedAircraftList getAircraftInRange() const = 0;

6
src/blackcore/context/contextnetworkempty.h
View File

@@ -37,15 +37,17 @@ namespace BlackCore
} }
//! \copydoc IContextNetwork::getAtcStationsOnline() //! \copydoc IContextNetwork::getAtcStationsOnline()
virtual BlackMisc::Aviation::CAtcStationList getAtcStationsOnline() const override virtual BlackMisc::Aviation::CAtcStationList getAtcStationsOnline(bool recalculateDistance) const override
{ {
Q_UNUSED(recalculateDistance);
logEmptyContextWarning(Q_FUNC_INFO); logEmptyContextWarning(Q_FUNC_INFO);
return BlackMisc::Aviation::CAtcStationList(); return BlackMisc::Aviation::CAtcStationList();
} }
//! \copydoc IContextNetwork::getAtcStationsBooked() //! \copydoc IContextNetwork::getAtcStationsBooked()
virtual BlackMisc::Aviation::CAtcStationList getAtcStationsBooked() const override virtual BlackMisc::Aviation::CAtcStationList getAtcStationsBooked(bool recalculateDistance) const override
{ {
Q_UNUSED(recalculateDistance);
logEmptyContextWarning(Q_FUNC_INFO); logEmptyContextWarning(Q_FUNC_INFO);
return BlackMisc::Aviation::CAtcStationList(); return BlackMisc::Aviation::CAtcStationList();
} }

16
src/blackcore/context/contextnetworkimpl.cpp
View File

@@ -384,7 +384,7 @@ namespace BlackCore
if (parser.countParts() < 2) { return false; } if (parser.countParts() < 2) { return false; }
const bool watchdog = parser.toBool(1, true); const bool watchdog = parser.toBool(1, true);
m_airspace->enableWatchdog(watchdog); m_airspace->enableAnalyzer(watchdog);
CLogMessage(this).info("Enabled watchdog: %1") << boolToYesNo(watchdog); CLogMessage(this).info("Enabled watchdog: %1") << boolToYesNo(watchdog);
} }
else if (parser.matchesCommand(".reinit", ".reinitialize")) else if (parser.matchesCommand(".reinit", ".reinitialize"))
@@ -595,16 +595,22 @@ namespace BlackCore
return this->getRuntime()->getCContextOwnAircraft()->getOwnAircraft(); return this->getRuntime()->getCContextOwnAircraft()->getOwnAircraft();
} }
CAtcStationList CContextNetwork::getAtcStationsOnline() const CAtcStationList CContextNetwork::getAtcStationsOnline(bool recalculateDistance) const
{ {
if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; }
return m_airspace->getAtcStationsOnline(); CAtcStationList stations = m_airspace->getAtcStationsOnline();
if (!recalculateDistance || !this->getIContextOwnAircraft()) { return stations; }
stations.calculcateAndUpdateRelativeDistanceAndBearing(this->getIContextOwnAircraft()->getOwnAircraftSituation());
return stations;
} }
CAtcStationList CContextNetwork::getAtcStationsBooked() const CAtcStationList CContextNetwork::getAtcStationsBooked(bool recalculateDistance) const
{ {
if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; }
return m_airspace->getAtcStationsBooked(); CAtcStationList stations = m_airspace->getAtcStationsBooked();
if (!recalculateDistance || !this->getIContextOwnAircraft()) { return stations; }
stations.calculcateAndUpdateRelativeDistanceAndBearing(this->getIContextOwnAircraft()->getOwnAircraftSituation());
return stations;
} }
CSimulatedAircraftList CContextNetwork::getAircraftInRange() const CSimulatedAircraftList CContextNetwork::getAircraftInRange() const

4
src/blackcore/context/contextnetworkimpl.h
View File

@@ -220,9 +220,9 @@ namespace BlackCore
//! \publicsection //! \publicsection
//! @{ //! @{
virtual BlackMisc::Aviation::CAtcStationList getAtcStationsBooked() const override;
virtual void requestAtcBookingsUpdate() const override; virtual void requestAtcBookingsUpdate() const override;
virtual BlackMisc::Aviation::CAtcStationList getAtcStationsOnline() const override; virtual BlackMisc::Aviation::CAtcStationList getAtcStationsBooked(bool recalculateDistance) const override;
virtual BlackMisc::Aviation::CAtcStationList getAtcStationsOnline(bool recalculateDistance) const override;
virtual BlackMisc::Aviation::CAtcStation getOnlineStationForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override; virtual BlackMisc::Aviation::CAtcStation getOnlineStationForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override;
virtual BlackMisc::CStatusMessage connectToNetwork(const BlackMisc::Network::CServer &server, BlackCore::INetwork::LoginMode mode) override; virtual BlackMisc::CStatusMessage connectToNetwork(const BlackMisc::Network::CServer &server, BlackCore::INetwork::LoginMode mode) override;
virtual BlackMisc::Network::CServer getConnectedServer() const override; virtual BlackMisc::Network::CServer getConnectedServer() const override;

8
src/blackcore/context/contextnetworkproxy.cpp
View File

@@ -108,14 +108,14 @@ namespace BlackCore
m_dBusInterface->callDBus(QLatin1String("requestAtcBookingsUpdate")); m_dBusInterface->callDBus(QLatin1String("requestAtcBookingsUpdate"));
} }
BlackMisc::Aviation::CAtcStationList CContextNetworkProxy::getAtcStationsOnline() const BlackMisc::Aviation::CAtcStationList CContextNetworkProxy::getAtcStationsOnline(bool recalculateDistance) const
{ {
return m_dBusInterface->callDBusRet<BlackMisc::Aviation::CAtcStationList>(QLatin1String("getAtcStationsOnline")); return m_dBusInterface->callDBusRet<BlackMisc::Aviation::CAtcStationList>(QLatin1String("getAtcStationsOnline"), recalculateDistance);
} }
CAtcStationList CContextNetworkProxy::getAtcStationsBooked() const CAtcStationList CContextNetworkProxy::getAtcStationsBooked(bool recalculateDistance) const
{ {
return m_dBusInterface->callDBusRet<BlackMisc::Aviation::CAtcStationList>(QLatin1String("getAtcStationsBooked")); return m_dBusInterface->callDBusRet<BlackMisc::Aviation::CAtcStationList>(QLatin1String("getAtcStationsBooked"), recalculateDistance);
} }
CSimulatedAircraftList CContextNetworkProxy::getAircraftInRange() const CSimulatedAircraftList CContextNetworkProxy::getAircraftInRange() const

6
src/blackcore/context/contextnetworkproxy.h
View File

@@ -66,7 +66,7 @@ namespace BlackCore
public: public:
//! Destructor //! Destructor
virtual ~CContextNetworkProxy() {} virtual ~CContextNetworkProxy() override {}
//! Unit test relay signals //! Unit test relay signals
//! \private //! \private
@@ -76,8 +76,8 @@ namespace BlackCore
//! \name Interface overrides //! \name Interface overrides
//! @{ //! @{
virtual void requestAtcBookingsUpdate() const override; virtual void requestAtcBookingsUpdate() const override;
virtual BlackMisc::Aviation::CAtcStationList getAtcStationsOnline() const override; virtual BlackMisc::Aviation::CAtcStationList getAtcStationsOnline(bool recalculateDistance) const override;
virtual BlackMisc::Aviation::CAtcStationList getAtcStationsBooked() const override; virtual BlackMisc::Aviation::CAtcStationList getAtcStationsBooked(bool recalculateDistance) const override;
virtual BlackMisc::Simulation::CSimulatedAircraftList getAircraftInRange() const override; virtual BlackMisc::Simulation::CSimulatedAircraftList getAircraftInRange() const override;
virtual BlackMisc::Aviation::CCallsignSet getAircraftInRangeCallsigns() const override; virtual BlackMisc::Aviation::CCallsignSet getAircraftInRangeCallsigns() const override;
virtual int getAircraftInRangeCount() const override; virtual int getAircraftInRangeCount() const override;