From 63e274386750b96a9e60659ce311136d5dd57d91 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Thu, 12 Jan 2017 18:13:02 +0100 Subject: [PATCH] refs #858, fixed todo by adding "getInterimPositionReceivers()" --- src/blackcore/context/contextnetwork.h | 2 +- src/blackcore/context/contextnetworkempty.h | 2 +- src/blackcore/context/contextnetworkimpl.cpp | 6 +++--- src/blackcore/context/contextnetworkimpl.h | 2 +- src/blackcore/context/contextnetworkproxy.cpp | 2 +- src/blackcore/context/contextnetworkproxy.h | 2 +- src/blackcore/network.h | 5 +++++ src/blackcore/vatsim/networkvatlib.cpp | 5 +++++ src/blackcore/vatsim/networkvatlib.h | 1 + 9 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/blackcore/context/contextnetwork.h b/src/blackcore/context/contextnetwork.h index 9c5207d4b..cabaa7f5f 100644 --- a/src/blackcore/context/contextnetwork.h +++ b/src/blackcore/context/contextnetwork.h @@ -215,7 +215,7 @@ namespace BlackCore virtual void setFastPositionEnabledCallsigns(BlackMisc::Aviation::CCallsignSet &callsigns) = 0; //! Callsigns enabled for fast position updates - virtual BlackMisc::Aviation::CCallsignSet getFastPositionEnabledCallsigns() = 0; + virtual BlackMisc::Aviation::CCallsignSet getFastPositionEnabledCallsigns() const = 0; //! Connect to Network //! \return messages generated during connecting diff --git a/src/blackcore/context/contextnetworkempty.h b/src/blackcore/context/contextnetworkempty.h index 18282d66b..b4d5758cd 100644 --- a/src/blackcore/context/contextnetworkempty.h +++ b/src/blackcore/context/contextnetworkempty.h @@ -304,7 +304,7 @@ namespace BlackCore } //! \copydoc IContextNetwork::getFastPositionEnabledCallsigns - virtual BlackMisc::Aviation::CCallsignSet getFastPositionEnabledCallsigns() override + virtual BlackMisc::Aviation::CCallsignSet getFastPositionEnabledCallsigns() const override { logEmptyContextWarning(Q_FUNC_INFO); return BlackMisc::Aviation::CCallsignSet(); diff --git a/src/blackcore/context/contextnetworkimpl.cpp b/src/blackcore/context/contextnetworkimpl.cpp index 98ad3e6e7..3a0ecacd4 100644 --- a/src/blackcore/context/contextnetworkimpl.cpp +++ b/src/blackcore/context/contextnetworkimpl.cpp @@ -659,14 +659,14 @@ namespace BlackCore { if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsigns; } Q_ASSERT(this->m_network); + this->m_network->setInterimPositionReceivers(callsigns); } - CCallsignSet CContextNetwork::getFastPositionEnabledCallsigns() + CCallsignSet CContextNetwork::getFastPositionEnabledCallsigns() const { if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } Q_ASSERT(this->m_network); - //! \todo Fast position updates in vatlib - return CCallsignSet(); + return this->m_network->getInterimPositionReceivers(); } void CContextNetwork::testCreateDummyOnlineAtcStations(int number) diff --git a/src/blackcore/context/contextnetworkimpl.h b/src/blackcore/context/contextnetworkimpl.h index d92edac66..3d35284f6 100644 --- a/src/blackcore/context/contextnetworkimpl.h +++ b/src/blackcore/context/contextnetworkimpl.h @@ -167,7 +167,7 @@ namespace BlackCore virtual void requestDataUpdates()override; virtual void requestAtisUpdates() override; virtual void setFastPositionEnabledCallsigns(BlackMisc::Aviation::CCallsignSet &callsigns) override; - virtual BlackMisc::Aviation::CCallsignSet getFastPositionEnabledCallsigns() override; + virtual BlackMisc::Aviation::CCallsignSet getFastPositionEnabledCallsigns() const override; virtual void testCreateDummyOnlineAtcStations(int number) override; virtual void testAddAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftParts &parts, bool incremental) override; virtual void testReceivedTextMessages(const BlackMisc::Network::CTextMessageList &textMessages) override; diff --git a/src/blackcore/context/contextnetworkproxy.cpp b/src/blackcore/context/contextnetworkproxy.cpp index 014c5f83a..6861ad81f 100644 --- a/src/blackcore/context/contextnetworkproxy.cpp +++ b/src/blackcore/context/contextnetworkproxy.cpp @@ -211,7 +211,7 @@ namespace BlackCore this->m_dBusInterface->callDBus(QLatin1Literal("setFastPositionEnabledCallsigns"), callsigns); } - CCallsignSet CContextNetworkProxy::getFastPositionEnabledCallsigns() + CCallsignSet CContextNetworkProxy::getFastPositionEnabledCallsigns() const { return this->m_dBusInterface->callDBusRet(QLatin1Literal("getFastPositionEnabledCallsigns")); } diff --git a/src/blackcore/context/contextnetworkproxy.h b/src/blackcore/context/contextnetworkproxy.h index 2911e0207..7c603593f 100644 --- a/src/blackcore/context/contextnetworkproxy.h +++ b/src/blackcore/context/contextnetworkproxy.h @@ -105,7 +105,7 @@ namespace BlackCore virtual bool updateAircraftNetworkModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::CIdentifier &originator) override; virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositionSending) override; virtual void setFastPositionEnabledCallsigns(BlackMisc::Aviation::CCallsignSet &callsigns) override; - virtual BlackMisc::Aviation::CCallsignSet getFastPositionEnabledCallsigns() override; + virtual BlackMisc::Aviation::CCallsignSet getFastPositionEnabledCallsigns() const override; virtual BlackMisc::CStatusMessageList getReverseLookupMessages(const BlackMisc::Aviation::CCallsign &callsign) const override; virtual bool isReverseLookupMessagesEnabled() const override; virtual void enableReverseLookupMessages(bool enabled) override; diff --git a/src/blackcore/network.h b/src/blackcore/network.h index 4d75d21df..3abcf6b9c 100644 --- a/src/blackcore/network.h +++ b/src/blackcore/network.h @@ -358,6 +358,11 @@ namespace BlackCore */ virtual void setInterimPositionReceivers(const BlackMisc::Aviation::CCallsignSet &receiver) = 0; + /*! + * Get the group of callsigns receiving regular interim position updates. + */ + virtual const BlackMisc::Aviation::CCallsignSet &getInterimPositionReceivers() const = 0; + //! @} //////////////////////////////////////////////////////////////// //! \name Weather slots diff --git a/src/blackcore/vatsim/networkvatlib.cpp b/src/blackcore/vatsim/networkvatlib.cpp index 8f487bed8..5c9d310e7 100644 --- a/src/blackcore/vatsim/networkvatlib.cpp +++ b/src/blackcore/vatsim/networkvatlib.cpp @@ -517,6 +517,11 @@ namespace BlackCore m_interimPositionReceivers = receivers; } + const CCallsignSet &CNetworkVatlib::getInterimPositionReceivers() const + { + return m_interimPositionReceivers; + } + void CNetworkVatlib::sendServerQuery(const BlackMisc::Aviation::CCallsign &callsign) { Q_ASSERT_X(isConnected(), Q_FUNC_INFO, "Can't send to server when disconnected"); diff --git a/src/blackcore/vatsim/networkvatlib.h b/src/blackcore/vatsim/networkvatlib.h index b9924189a..1ba64bf2b 100644 --- a/src/blackcore/vatsim/networkvatlib.h +++ b/src/blackcore/vatsim/networkvatlib.h @@ -110,6 +110,7 @@ namespace BlackCore virtual void sendFrequencyQuery(const BlackMisc::Aviation::CCallsign &callsign) override; virtual void sendUserInfoQuery(const BlackMisc::Aviation::CCallsign &callsign) override; virtual void setInterimPositionReceivers(const BlackMisc::Aviation::CCallsignSet &receivers) override; + virtual const BlackMisc::Aviation::CCallsignSet &getInterimPositionReceivers() const override; //! @} //! \name Weather functions