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

Ref T566, use "configurable" reverse lookup in network/airspace monitor parts

Browse Source
This commit is contained in:
Klaus Basan
2019-04-08 03:01:04 +02:00
committed by Mat Sutcliffe
parent 002f9e6a9b
commit 991c7d59ef
10 changed files with 56 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,15 +11,12 @@
#ifndef BLACKCORE_CONTEXT_CONTEXTNETWORK_H
#define BLACKCORE_CONTEXT_CONTEXTNETWORK_H
#include <QObject>
#include <QString>
#include "blackcore/blackcoreexport.h"
#include "blackcore/context/context.h"
#include "blackcore/corefacade.h"
#include "blackcore/corefacadeconfig.h"
#include "blackcore/network.h"
#include "blackmisc/simulation/simulatedaircraft.h"
#include "blackcore/blackcoreexport.h"
#include "blackmisc/simulation/remoteaircraftprovider.h"
#include "blackmisc/simulation/simulatedaircraftlist.h"
#include "blackmisc/aviation/aircraftpartslist.h"
#include "blackmisc/aviation/airporticaocode.h"
@@ -40,6 +37,8 @@
#include "blackmisc/statusmessage.h"
#include "blackmisc/weather/metar.h"
#include <QObject>
#include <QString>
#include <functional>
// clazy:excludeall=const-signal-or-slot
@@ -304,10 +303,10 @@ namespace BlackCore
virtual BlackMisc::CStatusMessageList getReverseLookupMessages(const BlackMisc::Aviation::CCallsign &callsign) const = 0;
//! Enabled reverse lookup logging?
virtual bool isReverseLookupMessagesEnabled() const = 0;
virtual BlackMisc::Simulation::ReverseLookupLogging isReverseLookupMessagesEnabled() const = 0;
//! Enable reverse lookup logging
virtual void enableReverseLookupMessages(bool enabled) = 0;
virtual void enableReverseLookupMessages(BlackMisc::Simulation::ReverseLookupLogging enable) = 0;
//! Get aircraft parts history
virtual BlackMisc::CStatusMessageList getAircraftPartsHistory(const BlackMisc::Aviation::CCallsign &callsign) const = 0;

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

@@ -427,17 +427,17 @@ namespace BlackCore
}
//! \copydoc IContextNetwork::isReverseLookupMessagesEnabled
virtual bool isReverseLookupMessagesEnabled() const override
virtual BlackMisc::Simulation::ReverseLookupLogging isReverseLookupMessagesEnabled() const override
{
logEmptyContextWarning(Q_FUNC_INFO);
return false;
return BlackMisc::Simulation::RevLogDisabled;
}
//! \copydoc IContextNetwork::enableReverseLookupMessages
virtual void enableReverseLookupMessages(bool enabled) override
virtual void enableReverseLookupMessages(BlackMisc::Simulation::ReverseLookupLogging enable) override
{
logEmptyContextWarning(Q_FUNC_INFO);
Q_UNUSED(enabled);
Q_UNUSED(enable);
}
//! \copydoc IContextNetwork::getAircraftPartsHistory

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

@@ -697,17 +697,18 @@ namespace BlackCore
return m_airspace->getReverseLookupMessages(callsign);
}
bool CContextNetwork::isReverseLookupMessagesEnabled() const
ReverseLookupLogging CContextNetwork::isReverseLookupMessagesEnabled() const
{
if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; }
return m_airspace->isReverseLookupMessagesEnabled();
}
void CContextNetwork::enableReverseLookupMessages(bool enabled)
void CContextNetwork::enableReverseLookupMessages(ReverseLookupLogging enable)
{
if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << enabled; }
if (m_airspace->isReverseLookupMessagesEnabled() == enabled) { return; }
m_airspace->enableReverseLookupMessages(enabled);
if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << enable; }
const ReverseLookupLogging revEnabled = m_airspace->isReverseLookupMessagesEnabled();
if (revEnabled == enable) { return; }
m_airspace->enableReverseLookupMessages(enable);
emit CContext::changedLogOrDebugSettings();
}

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

@@ -163,7 +163,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 enableFastPositonUpdates) override;
virtual bool updateAircraftSupportingGndFLag(const BlackMisc::Aviation::CCallsign &callsign, bool supportGndFlag) override;
virtual void enableReverseLookupMessages(bool enabled) override;
virtual void enableReverseLookupMessages(BlackMisc::Simulation::ReverseLookupLogging enable) override;
// plain vanilla passing to airspace monitor
virtual bool setAircraftEnabledFlag(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRendering) override;
@@ -178,7 +178,7 @@ namespace BlackCore
virtual BlackMisc::Simulation::CSimulatedAircraft getAircraftInRangeForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override;
virtual BlackMisc::Simulation::CAircraftModel getAircraftInRangeModelForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override;
virtual BlackMisc::CStatusMessageList getReverseLookupMessages(const BlackMisc::Aviation::CCallsign &callsign) const override;
virtual bool isReverseLookupMessagesEnabled() const override;
virtual BlackMisc::Simulation::ReverseLookupLogging isReverseLookupMessagesEnabled() const override;
virtual BlackMisc::CStatusMessageList getAircraftPartsHistory(const BlackMisc::Aviation::CCallsign &callsign) const override;
virtual BlackMisc::Aviation::CAircraftPartsList getRemoteAircraftParts(const BlackMisc::Aviation::CCallsign &callsign) const override;
virtual int getRemoteAircraftSupportingPartsCount() const override;

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

@@ -273,14 +273,16 @@ namespace BlackCore
return m_dBusInterface->callDBusRet<CStatusMessageList>(QLatin1String("getReverseLookupMessages"), callsign);
}
bool CContextNetworkProxy::isReverseLookupMessagesEnabled() const
ReverseLookupLogging CContextNetworkProxy::isReverseLookupMessagesEnabled() const
{
return m_dBusInterface->callDBusRet<bool>(QLatin1String("isReverseLookupMessagesEnabled"));
//! \fixme KB 2019-04 directly return MatchingLog causes issues with QDbusArgument
const int r = m_dBusInterface->callDBusRet<int>(QLatin1String("isReverseLookupMessagesEnabled"));
return static_cast<ReverseLookupLogging>(r);
}
void CContextNetworkProxy::enableReverseLookupMessages(bool enabled)
void CContextNetworkProxy::enableReverseLookupMessages(ReverseLookupLogging enable)
{
m_dBusInterface->callDBus(QLatin1String("enableReverseLookupMessages"), enabled);
m_dBusInterface->callDBus(QLatin1String("enableReverseLookupMessages"), enable);
}
CStatusMessageList CContextNetworkProxy::getAircraftPartsHistory(const CCallsign &callsign) const

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

@@ -120,8 +120,8 @@ namespace BlackCore
virtual void setFastPositionEnabledCallsigns(BlackMisc::Aviation::CCallsignSet &callsigns) 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;
virtual BlackMisc::Simulation::ReverseLookupLogging isReverseLookupMessagesEnabled() const override;
virtual void enableReverseLookupMessages(BlackMisc::Simulation::ReverseLookupLogging enable) override;
virtual BlackMisc::CStatusMessageList getAircraftPartsHistory(const BlackMisc::Aviation::CCallsign &callsign) const override;
virtual BlackMisc::Aviation::CAircraftPartsList getRemoteAircraftParts(const BlackMisc::Aviation::CCallsign &callsign) const override;
virtual QString getLibraryInfo(bool detailed) const override;