diff --git a/src/blackcore/context/contextnetwork.h b/src/blackcore/context/contextnetwork.h index cabaa7f5f..9e2f4a4a3 100644 --- a/src/blackcore/context/contextnetwork.h +++ b/src/blackcore/context/contextnetwork.h @@ -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) {} diff --git a/src/blackcore/context/contextnetworkempty.h b/src/blackcore/context/contextnetworkempty.h index b4d5758cd..959bba376 100644 --- a/src/blackcore/context/contextnetworkempty.h +++ b/src/blackcore/context/contextnetworkempty.h @@ -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 { diff --git a/src/blackcore/context/contextnetworkimpl.cpp b/src/blackcore/context/contextnetworkimpl.cpp index f65a674ac..dfdcdf273 100644 --- a/src/blackcore/context/contextnetworkimpl.cpp +++ b/src/blackcore/context/contextnetworkimpl.cpp @@ -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; } diff --git a/src/blackcore/context/contextnetworkimpl.h b/src/blackcore/context/contextnetworkimpl.h index 8bc6d5e60..ce31ec382 100644 --- a/src/blackcore/context/contextnetworkimpl.h +++ b/src/blackcore/context/contextnetworkimpl.h @@ -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 --------------------- diff --git a/src/blackcore/context/contextnetworkproxy.cpp b/src/blackcore/context/contextnetworkproxy.cpp index 6861ad81f..8e9259cb3 100644 --- a/src/blackcore/context/contextnetworkproxy.cpp +++ b/src/blackcore/context/contextnetworkproxy.cpp @@ -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(QLatin1Literal("connectToNetwork"), server, loginMode); diff --git a/src/blackcore/context/contextnetworkproxy.h b/src/blackcore/context/contextnetworkproxy.h index 7c603593f..175be4ebe 100644 --- a/src/blackcore/context/contextnetworkproxy.h +++ b/src/blackcore/context/contextnetworkproxy.h @@ -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: