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

refs #873, allow to request aircraft parts (aircraft config) from network

Browse Source
This commit is contained in:
Klaus Basan
2017-02-03 03:20:12 +01:00
committed by Mathew Sutcliffe
parent 3afead9f71
commit 7eacb41113
6 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -299,6 +299,9 @@ namespace BlackCore
//! Inject a text message as received
virtual void testReceivedTextMessages(const BlackMisc::Network::CTextMessageList &textMessages) = 0;
//! Request parts for callsign (from another client)
virtual void testRequestAircraftConfig(const BlackMisc::Aviation::CCallsign &callsign) = 0;
protected:
//! Constructor
IContextNetwork(CCoreFacadeConfig::ContextMode mode, CCoreFacade *runtime) : CContext(mode, runtime) {}

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

@@ -235,6 +235,13 @@ namespace BlackCore
logEmptyContextWarning(Q_FUNC_INFO);
}
//! \copydoc IContextNetwork::testRequestAircraftConfig
virtual void testRequestAircraftConfig(const BlackMisc::Aviation::CCallsign &callsign) override
{
Q_UNUSED(callsign);
logEmptyContextWarning(Q_FUNC_INFO);
}
//! \copydoc IContextNetwork::parseCommandLine
virtual bool parseCommandLine(const QString &commandLine, const BlackMisc::CIdentifier &originator) override
{

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

@@ -183,7 +183,7 @@ namespace BlackCore
this->m_network->presetServer(server);
// Fall back to observer mode, if no simulator is available or not simulating
if(CBuildConfig::isShippedVersion() && !this->getIContextSimulator()->isSimulatorSimulating())
if (CBuildConfig::isShippedVersion() && !this->getIContextSimulator()->isSimulatorSimulating())
{
CLogMessage(this).info("No simulator connected or connected simulator not simulating. Falling back to observer mode");
mode = INetwork::LoginAsObserver;
@@ -679,6 +679,13 @@ namespace BlackCore
return this->m_network->getInterimPositionReceivers();
}
void CContextNetwork::testRequestAircraftConfig(const CCallsign &callsign)
{
if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign; }
Q_ASSERT(this->m_network);
this->m_network->sendAircraftConfigQuery(callsign);
}
void CContextNetwork::testCreateDummyOnlineAtcStations(int number)
{
if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << number; }

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

@@ -171,6 +171,7 @@ namespace BlackCore
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;
virtual void testRequestAircraftConfig(const BlackMisc::Aviation::CCallsign &callsign) override;
//! @}
// --------------------- IContextNetwork implementations ---------------------

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

@@ -266,6 +266,11 @@ namespace BlackCore
this->m_dBusInterface->callDBus(QLatin1Literal("testReceivedTextMessages"), textMessages);
}
void CContextNetworkProxy::testRequestAircraftConfig(const CCallsign &callsign)
{
this->m_dBusInterface->callDBus(QLatin1Literal("testRequestAircraftConfig"), callsign);
}
CStatusMessage CContextNetworkProxy::connectToNetwork(const CServer &server, INetwork::LoginMode loginMode)
{
return this->m_dBusInterface->callDBusRet<BlackMisc::CStatusMessage>(QLatin1Literal("connectToNetwork"), server, loginMode);

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

@@ -116,6 +116,7 @@ namespace BlackCore
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;
virtual void testRequestAircraftConfig(const BlackMisc::Aviation::CCallsign &callsign) override;
//! @}
private: