From 51e4cefa9426699238df8845e40cad25b4bb6acf Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sat, 26 Apr 2014 15:58:39 +0200 Subject: [PATCH] refs #212, added flight plan sending to network context --- src/blackcore/context_network.h | 3 +++ src/blackcore/context_network_impl.cpp | 9 +++++++++ src/blackcore/context_network_impl.h | 3 +++ src/blackcore/context_network_proxy.cpp | 5 +++++ src/blackcore/context_network_proxy.h | 3 +++ 5 files changed, 23 insertions(+) diff --git a/src/blackcore/context_network.h b/src/blackcore/context_network.h index 3dbbd4500..136435250 100644 --- a/src/blackcore/context_network.h +++ b/src/blackcore/context_network.h @@ -135,6 +135,9 @@ namespace BlackCore //! Text messages (radio and private chat messages) virtual void sendTextMessages(const BlackMisc::Network::CTextMessageList &textMessages) = 0; + //! Send flight plan + virtual void sendFlightPlan(const BlackMisc::Aviation::CFlightPlan &flightPlan) = 0; + /*! * \brief Get METAR, if not available request it * \param airportIcaoCode such as EDDF, KLAX diff --git a/src/blackcore/context_network_impl.cpp b/src/blackcore/context_network_impl.cpp index 42a57d80b..d37f217df 100644 --- a/src/blackcore/context_network_impl.cpp +++ b/src/blackcore/context_network_impl.cpp @@ -267,6 +267,15 @@ namespace BlackCore this->m_network->sendTextMessages(textMessages); } + /* + * Flight plan + */ + void CContextNetwork::sendFlightPlan(const CFlightPlan &flightPlan) + { + if (this->getRuntime()->isSlotLogForNetworkEnabled()) this->getRuntime()->logSlot(Q_FUNC_INFO, flightPlan.toQString()); + this->m_network->sendFlightPlan(flightPlan); + } + /* * Connection status changed */ diff --git a/src/blackcore/context_network_impl.h b/src/blackcore/context_network_impl.h index 6e578ef65..31cfd8bf2 100644 --- a/src/blackcore/context_network_impl.h +++ b/src/blackcore/context_network_impl.h @@ -87,6 +87,9 @@ namespace BlackCore //! \copydoc IContextNetwork::sendTextMessages() virtual void sendTextMessages(const BlackMisc::Network::CTextMessageList &textMessages) override; + //! \copydoc IContextNetwork::sendFlightPlan() + virtual void sendFlightPlan(const BlackMisc::Aviation::CFlightPlan &flightPlan) override; + //! \copydoc IContextNetwork::getMetar() virtual BlackMisc::Aviation::CInformationMessage getMetar(const QString &airportIcaoCode) override; diff --git a/src/blackcore/context_network_proxy.cpp b/src/blackcore/context_network_proxy.cpp index 0d10a250f..64672f019 100644 --- a/src/blackcore/context_network_proxy.cpp +++ b/src/blackcore/context_network_proxy.cpp @@ -158,6 +158,11 @@ namespace BlackCore this->m_dBusInterface->callDBus(QLatin1Literal("sendTextMessages"), textMessages); } + void CContextNetworkProxy::sendFlightPlan(const BlackMisc::Aviation::CFlightPlan &flightPlan) + { + this->m_dBusInterface->callDBus(QLatin1Literal("sendFlightPlan"), flightPlan); + } + BlackMisc::Aviation::CInformationMessage CContextNetworkProxy::getMetar(const QString &airportIcaoCode) { return this->m_dBusInterface->callDBusRet(QLatin1Literal("getMetar"), airportIcaoCode); diff --git a/src/blackcore/context_network_proxy.h b/src/blackcore/context_network_proxy.h index c0136169e..426c380cf 100644 --- a/src/blackcore/context_network_proxy.h +++ b/src/blackcore/context_network_proxy.h @@ -101,6 +101,9 @@ namespace BlackCore //! \copydoc IContextNetwork::sendTextMessages() virtual void sendTextMessages(const BlackMisc::Network::CTextMessageList &textMessages) override; + //! \copydoc IContextNetwork::sendFlightPlan() + virtual void sendFlightPlan(const BlackMisc::Aviation::CFlightPlan &flightPlan) override; + //! \copydoc IContextNetwork::getMetar() virtual BlackMisc::Aviation::CInformationMessage getMetar(const QString &airportIcaoCode) override;