flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-31 12:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #858, fixed todo by adding "getInterimPositionReceivers()"

Browse Source
This commit is contained in:
Klaus Basan
2017-01-12 18:13:02 +01:00
committed by Mathew Sutcliffe
parent 61e7f23847
commit 63e2743867
9 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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

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

@@ -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();

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

@@ -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)

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

@@ -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;

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

@@ -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<CCallsignSet>(QLatin1Literal("getFastPositionEnabledCallsigns"));
}

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

@@ -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;

5
src/blackcore/network.h
View File

@@ -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

5
src/blackcore/vatsim/networkvatlib.cpp
View File

@@ -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");

1
src/blackcore/vatsim/networkvatlib.h
View File

@@ -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