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

Merge branch 'main' into msfs2024_new_ml

Browse Source
This commit is contained in:
tzobler
2025-11-21 14:10:30 +01:00
parent 87543a1129 14ff2066b7
commit 5951f75fe1
1129 changed files with 4643 additions and 4680 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/simulator/emulated/simulatoremulated.cpp
View File

@@ -38,7 +38,7 @@ namespace swift::simplugin::emulated
this->onSettingsChanged(); // init from settings
m_myAircraft = this->getOwnAircraft(); // sync with provider
m_monitorWidget = new CSimulatorEmulatedMonitorDialog(this, sGui->mainApplicationWidget());
m_monitorWidget = new CSimulatorEmulatedMonitorDialog(this, CGuiApplication::mainApplicationWidget());
connect(qApp, &QApplication::aboutToQuit, this, &CSimulatorEmulated::closeMonitor);
connect(sGui, &CGuiApplication::aboutToShutdown, this, &CSimulatorEmulated::closeMonitor, Qt::QueuedConnection);
@@ -181,7 +181,7 @@ namespace swift::simplugin::emulated
CStatusMessageList CSimulatorEmulated::getInterpolationMessages(const CCallsign &callsign) const
{
if (canLog()) { m_monitorWidget->appendReceivingCall(Q_FUNC_INFO); }
if (!m_interpolators.contains(callsign)) { return CStatusMessageList(); }
if (!m_interpolators.contains(callsign)) { return {}; }
const CInterpolationAndRenderingSetupPerCallsign setup =
this->getInterpolationSetupPerCallsignOrDefault(callsign); // threadsafe copy
return m_interpolators[callsign]->getInterpolationMessages(setup.getInterpolatorMode());

71
src/plugins/simulator/emulated/simulatoremulated.h
View File

@@ -43,39 +43,37 @@ namespace swift::simplugin::emulated
swift::misc::network::IClientProvider *clientProvider, QObject *parent = nullptr);
//! Destructor
virtual ~CSimulatorEmulated() override;
~CSimulatorEmulated() override;
// functions implemented
virtual bool connectTo() override;
virtual bool disconnectFrom() override;
virtual void unload() override;
virtual bool isConnected() const override;
virtual bool isPaused() const override;
virtual bool isSimulating() const override;
virtual bool changeRemoteAircraftModel(const swift::misc::simulation::CSimulatedAircraft &aircraft) override;
virtual bool changeRemoteAircraftEnabled(const swift::misc::simulation::CSimulatedAircraft &aircraft) override;
virtual bool updateOwnSimulatorCockpit(const swift::misc::simulation::CSimulatedAircraft &aircraft,
const swift::misc::CIdentifier &originator) override;
virtual bool updateOwnSimulatorSelcal(const swift::misc::aviation::CSelcal &selcal,
const swift::misc::CIdentifier &originator) override;
virtual void displayStatusMessage(const swift::misc::CStatusMessage &message) const override;
virtual void displayTextMessage(const swift::misc::network::CTextMessage &message) const override;
virtual bool isPhysicallyRenderedAircraft(const swift::misc::aviation::CCallsign &callsign) const override;
virtual swift::misc::aviation::CCallsignSet physicallyRenderedAircraft() const override;
virtual swift::misc::CStatusMessageList
bool connectTo() override;
bool disconnectFrom() override;
void unload() override;
bool isConnected() const override;
bool isPaused() const override;
bool isSimulating() const override;
bool changeRemoteAircraftModel(const swift::misc::simulation::CSimulatedAircraft &aircraft) override;
bool changeRemoteAircraftEnabled(const swift::misc::simulation::CSimulatedAircraft &aircraft) override;
bool updateOwnSimulatorCockpit(const swift::misc::simulation::CSimulatedAircraft &aircraft,
const swift::misc::CIdentifier &originator) override;
bool updateOwnSimulatorSelcal(const swift::misc::aviation::CSelcal &selcal,
const swift::misc::CIdentifier &originator) override;
void displayStatusMessage(const swift::misc::CStatusMessage &message) const override;
void displayTextMessage(const swift::misc::network::CTextMessage &message) const override;
bool isPhysicallyRenderedAircraft(const swift::misc::aviation::CCallsign &callsign) const override;
swift::misc::aviation::CCallsignSet physicallyRenderedAircraft() const override;
swift::misc::CStatusMessageList
getInterpolationMessages(const swift::misc::aviation::CCallsign &callsign) const override;
virtual bool testSendSituationAndParts(const swift::misc::aviation::CCallsign &callsign,
const swift::misc::aviation::CAircraftSituation &situation,
const swift::misc::aviation::CAircraftParts &parts) override;
virtual bool requestElevation(const swift::misc::geo::ICoordinateGeodetic &reference,
const swift::misc::aviation::CCallsign &callsign) override;
bool testSendSituationAndParts(const swift::misc::aviation::CCallsign &callsign,
const swift::misc::aviation::CAircraftSituation &situation,
const swift::misc::aviation::CAircraftParts &parts) override;
bool requestElevation(const swift::misc::geo::ICoordinateGeodetic &reference,
const swift::misc::aviation::CCallsign &callsign) override;
// ----- functions just logged -------
virtual bool
logicallyAddRemoteAircraft(const swift::misc::simulation::CSimulatedAircraft &remoteAircraft) override;
virtual bool logicallyRemoveRemoteAircraft(const swift::misc::aviation::CCallsign &callsign) override;
virtual int
physicallyRemoveMultipleRemoteAircraft(const swift::misc::aviation::CCallsignSet &callsigns) override;
bool logicallyAddRemoteAircraft(const swift::misc::simulation::CSimulatedAircraft &remoteAircraft) override;
bool logicallyRemoveRemoteAircraft(const swift::misc::aviation::CCallsign &callsign) override;
int physicallyRemoveMultipleRemoteAircraft(const swift::misc::aviation::CCallsignSet &callsigns) override;
// functions logged and used
//! \ingroup swiftdotcommands
@@ -84,7 +82,7 @@ namespace swift::simplugin::emulated
//! .drv hide hide emulated driver window swift::simplugin::emulated::CSimulatorEmulated
//! </pre>
//! \copydoc swift::core::ISimulator::parseCommandLine
virtual bool parseCommandLine(const QString &commandLine, const swift::misc::CIdentifier &originator) override;
bool parseCommandLine(const QString &commandLine, const swift::misc::CIdentifier &originator) override;
//! UI setter
void setCombinedStatus(bool connected, bool simulating, bool paused);
@@ -131,13 +129,12 @@ namespace swift::simplugin::emulated
void internalAircraftChanged();
protected:
virtual bool
physicallyAddRemoteAircraft(const swift::misc::simulation::CSimulatedAircraft &remoteAircraft) override;
virtual bool physicallyRemoveRemoteAircraft(const swift::misc::aviation::CCallsign &callsign) override;
virtual int physicallyRemoveAllRemoteAircraft() override;
bool physicallyAddRemoteAircraft(const swift::misc::simulation::CSimulatedAircraft &remoteAircraft) override;
bool physicallyRemoveRemoteAircraft(const swift::misc::aviation::CCallsign &callsign) override;
int physicallyRemoveAllRemoteAircraft() override;
//! \copydoc swift::core::ISimulator::parseDetails
virtual bool parseDetails(const swift::misc::CSimpleCommandParser &parser) override;
bool parseDetails(const swift::misc::CSimpleCommandParser &parser) override;
private:
//! Set object name
@@ -195,13 +192,13 @@ namespace swift::simplugin::emulated
protected:
//! \copydoc swift::core::ISimulatorListener::startImpl
virtual void startImpl() override;
void startImpl() override;
//! \copydoc swift::core::ISimulatorListener::stopImpl
virtual void stopImpl() override;
void stopImpl() override;
//! \copydoc swift::core::ISimulatorListener::stopImpl
virtual void checkImpl() override;
void checkImpl() override;
};
} // namespace swift::simplugin::emulated

11
src/plugins/simulator/emulated/simulatoremulatedfactory.h
View File

@@ -23,14 +23,13 @@ namespace swift::simplugin::emulated
public:
//! \copydoc swift::core::ISimulatorFactory::create
virtual swift::core::ISimulator *
create(const swift::misc::simulation::CSimulatorPluginInfo &info,
swift::misc::simulation::IOwnAircraftProvider *ownAircraftProvider,
swift::misc::simulation::IRemoteAircraftProvider *remoteAircraftProvider,
swift::misc::network::IClientProvider *clientProvider) override;
swift::core::ISimulator *create(const swift::misc::simulation::CSimulatorPluginInfo &info,
swift::misc::simulation::IOwnAircraftProvider *ownAircraftProvider,
swift::misc::simulation::IRemoteAircraftProvider *remoteAircraftProvider,
swift::misc::network::IClientProvider *clientProvider) override;
//! \copydoc swift::core::ISimulatorFactory::createListener
virtual swift::core::ISimulatorListener *
swift::core::ISimulatorListener *
createListener(const swift::misc::simulation::CSimulatorPluginInfo &info) override;
};
} // namespace swift::simplugin::emulated

2
src/plugins/simulator/emulated/simulatoremulatedmonitordialog.cpp
View File

@@ -96,7 +96,7 @@ namespace swift::simplugin::emulated
this->updateWindowTitleAndUiValues(simulator->getSimulatorInfo());
}
CSimulatorEmulatedMonitorDialog::~CSimulatorEmulatedMonitorDialog() {}
CSimulatorEmulatedMonitorDialog::~CSimulatorEmulatedMonitorDialog() = default;
void CSimulatorEmulatedMonitorDialog::appendStatusMessageToList(const swift::misc::CStatusMessage &statusMessage)
{

2
src/plugins/simulator/emulated/simulatoremulatedmonitordialog.h
View File

@@ -39,7 +39,7 @@ namespace swift::simplugin::emulated
explicit CSimulatorEmulatedMonitorDialog(CSimulatorEmulated *simulator, QWidget *parent = nullptr);
//! Dtor
virtual ~CSimulatorEmulatedMonitorDialog() override;
~CSimulatorEmulatedMonitorDialog() override;
//! Append status message
void appendStatusMessageToList(const swift::misc::CStatusMessage &statusMessage);

2
src/plugins/simulator/emulatedconfig/simulatoremulatedconfig.h
View File

@@ -24,7 +24,7 @@ namespace swift::simplugin::emulated
CSimulatorEmulatedConfig(QObject *parent = nullptr);
//! Dtor
virtual ~CSimulatorEmulatedConfig() override {}
~CSimulatorEmulatedConfig() override = default;
//! \copydoc swift::gui::IPluginConfig::createConfigWindow()
swift::gui::CPluginConfigWindow *createConfigWindow(QWidget *parent) override;

2
src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.cpp
View File

@@ -17,5 +17,5 @@ namespace swift::simplugin::emulated
connect(ui->bb_Close, &QDialogButtonBox::rejected, this, &CSimulatorEmulatedConfigWidget::close);
}
CSimulatorEmulatedConfigWidget::~CSimulatorEmulatedConfigWidget() {}
CSimulatorEmulatedConfigWidget::~CSimulatorEmulatedConfigWidget() = default;
} // namespace swift::simplugin::emulated

2
src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.h
View File

@@ -28,7 +28,7 @@ namespace swift::simplugin::emulated
explicit CSimulatorEmulatedConfigWidget(QWidget *parent = nullptr);
//! Dtor
virtual ~CSimulatorEmulatedConfigWidget();
~CSimulatorEmulatedConfigWidget() override;
private:
QScopedPointer<Ui::CSimulatorEmulatedConfigWidget> ui;

2
src/plugins/simulator/flightgear/fgswiftbusserviceproxy.cpp
View File

@@ -21,7 +21,7 @@ namespace swift::simplugin::flightgear
InterfaceName(), connection, this);
if (!dummy)
{
bool s;
bool s {};
s = connection.connect(
QString(), "/fgswiftbus/service", "org.swift_project.fgswiftbus.service", "aircraftModelChanged", this,
SIGNAL(aircraftModelChanged(QString, QString, QString, QString, QString, QString, QString)));

2
src/plugins/simulator/flightgear/fgswiftbustrafficproxy.cpp
View File

@@ -21,7 +21,7 @@ namespace swift::simplugin::flightgear
connection, this);
if (!dummy)
{
bool s;
bool s {};
s = connection.connect(QString(), "/fgswiftbus/traffic", "org.swift_project.fgswiftbus.traffic", "simFrame",
this, SIGNAL(simFrame()));
Q_ASSERT(s);

4
src/plugins/simulator/flightgear/flightgearmpaircraft.cpp
View File

@@ -13,8 +13,6 @@ using namespace swift::misc::simulation;
namespace swift::simplugin::flightgear
{
CFlightgearMPAircraft::CFlightgearMPAircraft() {}
CFlightgearMPAircraft::CFlightgearMPAircraft(const CSimulatedAircraft &aircraft, ISimulator *simulator,
CInterpolationLogger *logger)
: m_aircraft(aircraft),
@@ -57,7 +55,7 @@ namespace swift::simplugin::flightgear
return this->getInterpolator() ? this->getInterpolator()->getInterpolationMessages(mode) : CStatusMessageList();
}
CCallsignSet CFlightgearMPAircraftObjects::getAllCallsigns() const { return CCallsignSet(this->keys()); }
CCallsignSet CFlightgearMPAircraftObjects::getAllCallsigns() const { return { this->keys() }; }
QStringList CFlightgearMPAircraftObjects::getAllCallsignStrings(bool sorted) const
{

4
src/plugins/simulator/flightgear/flightgearmpaircraft.h
View File

@@ -23,7 +23,7 @@ namespace swift::simplugin::flightgear
{
public:
//! Constructor
CFlightgearMPAircraft();
CFlightgearMPAircraft() = default;
//! Constructor providing initial situation/parts
CFlightgearMPAircraft(const swift::misc::simulation::CSimulatedAircraft &aircraft,
@@ -31,7 +31,7 @@ namespace swift::simplugin::flightgear
swift::misc::simulation::CInterpolationLogger *logger);
//! Destructor
~CFlightgearMPAircraft() {}
~CFlightgearMPAircraft() = default;
//! Set simulated aircraft
void setSimulatedAircraft(const swift::misc::simulation::CSimulatedAircraft &simulatedAircraft);

25
src/plugins/simulator/flightgear/simulatorflightgear.cpp
View File

@@ -3,7 +3,7 @@
#include "simulatorflightgear.h"
#include <math.h>
#include <cmath>
#include <QColor>
#include <QDBusServiceWatcher>
@@ -131,7 +131,7 @@ namespace swift::simplugin::flightgear
CStatusMessageList CSimulatorFlightgear::getInterpolationMessages(const CCallsign &callsign) const
{
if (callsign.isEmpty() || !m_flightgearAircraftObjects.contains(callsign)) { return CStatusMessageList(); }
if (callsign.isEmpty() || !m_flightgearAircraftObjects.contains(callsign)) { return {}; }
const CInterpolationAndRenderingSetupPerCallsign setup =
this->getInterpolationSetupConsolidated(callsign, false);
return m_flightgearAircraftObjects[callsign].getInterpolationMessages(setup.getInterpolatorMode());
@@ -386,7 +386,7 @@ namespace swift::simplugin::flightgear
if (!m_serviceProxy) { return; }
CLogMessage(this).info(u"FG DBus service unregistered");
if (m_dbusMode == P2P) { m_dBusConnection.disconnectFromPeer(m_dBusConnection.name()); }
if (m_dbusMode == P2P) { QDBusConnection::disconnectFromPeer(m_dBusConnection.name()); }
m_dBusConnection = QDBusConnection { "default" };
if (m_watcher) { m_watcher->setConnection(m_dBusConnection); }
delete m_serviceProxy;
@@ -821,7 +821,7 @@ namespace swift::simplugin::flightgear
const qint64 wasStartedMs = m_addingInProgressAircraft.value(cs);
const qint64 deltaTimeMs = QDateTime::currentMSecsSinceEpoch() - wasStartedMs;
m_statsAddCurrentTimeMs = deltaTimeMs;
if (deltaTimeMs > m_statsAddMaxTimeMs) { m_statsAddMaxTimeMs = deltaTimeMs; }
m_statsAddMaxTimeMs = std::max(deltaTimeMs, m_statsAddMaxTimeMs);
m_addingInProgressAircraft.remove(cs);
}
@@ -872,7 +872,10 @@ namespace swift::simplugin::flightgear
}
using namespace std::placeholders;
auto callback = std::bind(&CSimulatorFlightgear::callbackReceivedRequestedElevation, this, _1, _2, false);
auto callback = [this](auto &&plane, auto &&callsign) {
callbackReceivedRequestedElevation(std::forward<decltype(plane)>(plane),
std::forward<decltype(callsign)>(callsign), false);
};
// Request
m_trafficProxy->getElevationAtPosition(callsign, pos.latitude().value(CAngleUnit::deg()),
@@ -975,7 +978,7 @@ namespace swift::simplugin::flightgear
if (m_addingInProgressAircraft.isEmpty()) { return empty; }
const QList<qint64> ts = m_addingInProgressAircraft.values();
const auto mm = std::minmax_element(ts.constBegin(), ts.constEnd());
return QPair<qint64, qint64>(*mm.first, *mm.second);
return { *mm.first, *mm.second };
}
bool CSimulatorFlightgear::canAddAircraft() const
@@ -1040,11 +1043,11 @@ namespace swift::simplugin::flightgear
m_conn = QDBusConnection::sessionBus();
if (!m_conn.isConnected())
{
m_conn.disconnectFromBus(m_conn.name());
QDBusConnection::disconnectFromBus(m_conn.name());
return;
}
checkConnectionCommon();
m_conn.disconnectFromBus(m_conn.name());
QDBusConnection::disconnectFromBus(m_conn.name());
}
void CSimulatorFlightgearListener::checkConnectionViaPeer(const QString &address)
@@ -1053,11 +1056,11 @@ namespace swift::simplugin::flightgear
if (!m_conn.isConnected())
{
// This is required to cleanup the connection in QtDBus
m_conn.disconnectFromPeer(m_conn.name());
QDBusConnection::disconnectFromPeer(m_conn.name());
return;
}
checkConnectionCommon();
m_conn.disconnectFromPeer(m_conn.name());
QDBusConnection::disconnectFromPeer(m_conn.name());
}
void CSimulatorFlightgearListener::checkConnectionCommon()
@@ -1100,7 +1103,7 @@ namespace swift::simplugin::flightgear
void CSimulatorFlightgearListener::serviceRegistered(const QString &serviceName)
{
if (serviceName == fgswiftbusServiceName()) { emit simulatorStarted(getPluginInfo()); }
m_conn.disconnectFromBus(m_conn.name());
QDBusConnection::disconnectFromBus(m_conn.name());
}
void CSimulatorFlightgearListener::fgSwiftBusServerSettingChanged()

70
src/plugins/simulator/flightgear/simulatorflightgear.h
View File

@@ -119,42 +119,41 @@ namespace swift::simplugin::flightgear
swift::misc::network::IClientProvider *clientProvider, QObject *parent = nullptr);
//! Dtor
virtual ~CSimulatorFlightgear() override;
~CSimulatorFlightgear() override;
//! \name ISimulator implementations
//! @{
virtual bool connectTo() override;
virtual bool disconnectFrom() override;
virtual bool updateOwnSimulatorCockpit(const swift::misc::simulation::CSimulatedAircraft &aircraft,
const swift::misc::CIdentifier &originator) override;
virtual bool updateOwnSimulatorSelcal(const swift::misc::aviation::CSelcal &selcal,
const swift::misc::CIdentifier &originator) override;
virtual void displayStatusMessage(const swift::misc::CStatusMessage &message) const override;
virtual void displayTextMessage(const swift::misc::network::CTextMessage &message) const override;
virtual bool isPhysicallyRenderedAircraft(const swift::misc::aviation::CCallsign &callsign) const override;
virtual swift::misc::aviation::CCallsignSet physicallyRenderedAircraft() const override;
virtual void unload() override;
virtual QString getStatisticsSimulatorSpecific() const override;
virtual void resetAircraftStatistics() override;
virtual swift::misc::CStatusMessageList
bool connectTo() override;
bool disconnectFrom() override;
bool updateOwnSimulatorCockpit(const swift::misc::simulation::CSimulatedAircraft &aircraft,
const swift::misc::CIdentifier &originator) override;
bool updateOwnSimulatorSelcal(const swift::misc::aviation::CSelcal &selcal,
const swift::misc::CIdentifier &originator) override;
void displayStatusMessage(const swift::misc::CStatusMessage &message) const override;
void displayTextMessage(const swift::misc::network::CTextMessage &message) const override;
bool isPhysicallyRenderedAircraft(const swift::misc::aviation::CCallsign &callsign) const override;
swift::misc::aviation::CCallsignSet physicallyRenderedAircraft() const override;
void unload() override;
QString getStatisticsSimulatorSpecific() const override;
void resetAircraftStatistics() override;
swift::misc::CStatusMessageList
getInterpolationMessages(const swift::misc::aviation::CCallsign &callsign) const override;
virtual bool testSendSituationAndParts(const swift::misc::aviation::CCallsign &callsign,
const swift::misc::aviation::CAircraftSituation &situation,
const swift::misc::aviation::CAircraftParts &parts) override;
virtual bool requestElevation(const swift::misc::geo::ICoordinateGeodetic &reference,
const swift::misc::aviation::CCallsign &callsign) override;
bool testSendSituationAndParts(const swift::misc::aviation::CCallsign &callsign,
const swift::misc::aviation::CAircraftSituation &situation,
const swift::misc::aviation::CAircraftParts &parts) override;
bool requestElevation(const swift::misc::geo::ICoordinateGeodetic &reference,
const swift::misc::aviation::CCallsign &callsign) override;
//! @}
protected:
//! \name ISimulator implementations
//! @{
virtual bool isConnected() const override;
virtual bool
physicallyAddRemoteAircraft(const swift::misc::simulation::CSimulatedAircraft &newRemoteAircraft) override;
virtual bool physicallyRemoveRemoteAircraft(const swift::misc::aviation::CCallsign &callsign) override;
virtual int physicallyRemoveAllRemoteAircraft() override;
virtual void clearAllRemoteAircraftData() override;
virtual bool isPaused() const override { return false; }
bool isConnected() const override;
bool physicallyAddRemoteAircraft(const swift::misc::simulation::CSimulatedAircraft &newRemoteAircraft) override;
bool physicallyRemoveRemoteAircraft(const swift::misc::aviation::CCallsign &callsign) override;
int physicallyRemoveAllRemoteAircraft() override;
void clearAllRemoteAircraftData() override;
bool isPaused() const override { return false; }
//! @}
private slots:
@@ -259,13 +258,13 @@ namespace swift::simplugin::flightgear
protected:
//! \copydoc swift::core::ISimulatorListener::startImpl
virtual void startImpl() override;
void startImpl() override;
//! \copydoc swift::core::ISimulatorListener::stopImpl
virtual void stopImpl() override;
void stopImpl() override;
//! \copydoc swift::core::ISimulatorListener::checkImpl
virtual void checkImpl() override;
void checkImpl() override;
private:
void checkConnection();
@@ -292,14 +291,13 @@ namespace swift::simplugin::flightgear
public:
//! \copydoc swift::core::ISimulatorFactory::create
virtual swift::core::ISimulator *
create(const swift::misc::simulation::CSimulatorPluginInfo &info,
swift::misc::simulation::IOwnAircraftProvider *ownAircraftProvider,
swift::misc::simulation::IRemoteAircraftProvider *remoteAircraftProvider,
swift::misc::network::IClientProvider *clientProvider) override;
swift::core::ISimulator *create(const swift::misc::simulation::CSimulatorPluginInfo &info,
swift::misc::simulation::IOwnAircraftProvider *ownAircraftProvider,
swift::misc::simulation::IRemoteAircraftProvider *remoteAircraftProvider,
swift::misc::network::IClientProvider *clientProvider) override;
//! \copydoc swift::core::ISimulatorFactory::createListener
virtual swift::core::ISimulatorListener *
swift::core::ISimulatorListener *
createListener(const swift::misc::simulation::CSimulatorPluginInfo &info) override
{
return new CSimulatorFlightgearListener(info);

2
src/plugins/simulator/flightgearconfig/simulatorflightgearconfig.cpp
View File

@@ -13,7 +13,7 @@ namespace swift::simplugin::flightgear
swift::gui::CPluginConfigWindow *CSimulatorFlightgearConfig::createConfigWindow(QWidget *parent)
{
CSimulatorFlightgearConfigWindow *w = new CSimulatorFlightgearConfigWindow(parent);
auto w = new CSimulatorFlightgearConfigWindow(parent);
return w;
}
} // namespace swift::simplugin::flightgear

2
src/plugins/simulator/flightgearconfig/simulatorflightgearconfig.h
View File

@@ -34,7 +34,7 @@ namespace swift::simplugin::flightgear
CSimulatorFlightgearConfig(QObject *parent = nullptr);
//! Dtor
virtual ~CSimulatorFlightgearConfig() {}
~CSimulatorFlightgearConfig() override = default;
//! \copydoc swift::gui::IPluginConfig::createConfigWindow()
swift::gui::CPluginConfigWindow *createConfigWindow(QWidget *parent) override;

2
src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.cpp
View File

@@ -32,7 +32,7 @@ namespace swift::simplugin::flightgear
connect(ui->bb_OkCancel, &QDialogButtonBox::rejected, this, &CSimulatorFlightgearConfigWindow::close);
}
CSimulatorFlightgearConfigWindow::~CSimulatorFlightgearConfigWindow() {}
CSimulatorFlightgearConfigWindow::~CSimulatorFlightgearConfigWindow() = default;
CFGSwiftBusSettings CSimulatorFlightgearConfigWindow::getSettingsFromUI() const
{

2
src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.h
View File

@@ -32,7 +32,7 @@ namespace swift::simplugin::flightgear
CSimulatorFlightgearConfigWindow(QWidget *parent);
//! Dtor.
virtual ~CSimulatorFlightgearConfigWindow();
~CSimulatorFlightgearConfigWindow() override;
private:
//! Settings have been accepted

4
src/plugins/simulator/plugincommon/simulatorplugincommon.cpp
View File

@@ -44,8 +44,8 @@ namespace swift::simplugin::common
{
if (!m_interpolationDisplayDialog)
{
QWidget *parentWidget = sGui ? sGui->mainApplicationWidget() : nullptr;
CInterpolationLogDisplayDialog *dialog = new CInterpolationLogDisplayDialog(this, nullptr, parentWidget);
QWidget *parentWidget = sGui ? CGuiApplication::mainApplicationWidget() : nullptr;
auto *dialog = new CInterpolationLogDisplayDialog(this, nullptr, parentWidget);
m_interpolationDisplayDialog = dialog;
m_interpolationDisplayDialog->setModal(false);
}

8
src/plugins/simulator/plugincommon/simulatorplugincommon.h
View File

@@ -28,11 +28,11 @@ namespace swift::simplugin::common
public:
//! Destructor
virtual ~CSimulatorPluginCommon() override;
~CSimulatorPluginCommon() override;
// --------- ISimulator implementations ------------
virtual void unload() override;
virtual bool disconnectFrom() override;
void unload() override;
bool disconnectFrom() override;
protected:
//! Constructor
@@ -45,7 +45,7 @@ namespace swift::simplugin::common
//! <pre>
//! .drv intdisplay interpolation log display
//! </pre>
virtual bool parseDetails(const swift::misc::CSimpleCommandParser &parser) override;
bool parseDetails(const swift::misc::CSimpleCommandParser &parser) override;
//! Register help
static void registerHelp();

2
src/plugins/simulator/plugincommon/simulatorplugincommonexport.h
View File

@@ -14,7 +14,7 @@
*/
#ifndef WITH_STATIC
# if defined(BUILD_SIMULATORPLUGINCOMMON_LIB)
# ifdef BUILD_SIMULATORPLUGINCOMMON_LIB
# define SIMULATORPLUGINCOMMON_EXPORT Q_DECL_EXPORT
# else
# define SIMULATORPLUGINCOMMON_EXPORT Q_DECL_IMPORT

30
src/plugins/simulator/xplane/simulatorxplane.cpp
View File

@@ -3,7 +3,7 @@
#include "simulatorxplane.h"
#include <math.h>
#include <cmath>
#include <QColor>
#include <QDBusServiceWatcher>
@@ -137,7 +137,7 @@ namespace swift::simplugin::xplane
CStatusMessageList CSimulatorXPlane::getInterpolationMessages(const CCallsign &callsign) const
{
if (callsign.isEmpty() || !m_xplaneAircraftObjects.contains(callsign)) { return CStatusMessageList(); }
if (callsign.isEmpty() || !m_xplaneAircraftObjects.contains(callsign)) { return {}; }
const CInterpolationAndRenderingSetupPerCallsign setup =
this->getInterpolationSetupConsolidated(callsign, false);
return m_xplaneAircraftObjects[callsign].getInterpolationMessages(setup.getInterpolatorMode());
@@ -267,7 +267,11 @@ namespace swift::simplugin::xplane
}
using namespace std::placeholders;
auto callback = std::bind(&CSimulatorXPlane::callbackReceivedRequestedElevation, this, _1, _2, _3);
auto callback = [this](auto &&plane, auto &&callsign, auto &&isWater) {
callbackReceivedRequestedElevation(std::forward<decltype(plane)>(plane),
std::forward<decltype(callsign)>(callsign),
std::forward<decltype(isWater)>(isWater));
};
// Request
m_trafficProxy->getElevationAtPosition(callsign, pos.latitude().value(CAngleUnit::deg()),
@@ -538,7 +542,7 @@ namespace swift::simplugin::xplane
if (!m_serviceProxy) { return; }
CLogMessage(this).info(u"XPlane xSwiftBus service unregistered");
if (m_dbusMode == P2P) { m_dBusConnection.disconnectFromPeer(m_dBusConnection.name()); }
if (m_dbusMode == P2P) { QDBusConnection::disconnectFromPeer(m_dBusConnection.name()); }
m_dBusConnection = QDBusConnection { "default" };
if (m_watcher) { m_watcher->setConnection(m_dBusConnection); }
delete m_serviceProxy;
@@ -1085,7 +1089,7 @@ namespace swift::simplugin::xplane
// so not to override it with some DB value in X mode, we set it to "0"
if (model.getDistributor().matchesKeyOrAlias(CDistributor::xplaneXcsl()) && cg.isNull())
{
return CLength(0.0, CLengthUnit::ft());
return { 0.0, CLengthUnit::ft() };
}
return cg;
}
@@ -1129,7 +1133,7 @@ namespace swift::simplugin::xplane
void CSimulatorXPlane::onXSwiftBusSettingsChanged()
{
bool ok;
bool ok {};
const CXSwiftBusSettings xPlaneSide = this->receiveXSwiftBusSettings(ok);
if (ok)
{
@@ -1167,7 +1171,7 @@ namespace swift::simplugin::xplane
const qint64 wasStartedMs = m_addingInProgressAircraft.value(cs);
const qint64 deltaTimeMs = QDateTime::currentMSecsSinceEpoch() - wasStartedMs;
m_statsAddCurrentTimeMs = deltaTimeMs;
if (deltaTimeMs > m_statsAddMaxTimeMs) { m_statsAddMaxTimeMs = deltaTimeMs; }
m_statsAddMaxTimeMs = std::max(deltaTimeMs, m_statsAddMaxTimeMs);
m_addingInProgressAircraft.remove(cs);
}
@@ -1293,7 +1297,7 @@ namespace swift::simplugin::xplane
if (m_addingInProgressAircraft.isEmpty()) { return empty; }
const QList<qint64> ts = m_addingInProgressAircraft.values();
const auto mm = std::minmax_element(ts.constBegin(), ts.constEnd());
return QPair<qint64, qint64>(*mm.first, *mm.second);
return { *mm.first, *mm.second };
}
bool CSimulatorXPlane::canAddAircraft() const
@@ -1369,11 +1373,11 @@ namespace swift::simplugin::xplane
m_DBusConnection = QDBusConnection::sessionBus();
if (!m_DBusConnection.isConnected())
{
m_DBusConnection.disconnectFromBus(m_DBusConnection.name());
QDBusConnection::disconnectFromBus(m_DBusConnection.name());
return;
}
checkConnectionCommon(); // bus
m_DBusConnection.disconnectFromBus(m_DBusConnection.name());
QDBusConnection::disconnectFromBus(m_DBusConnection.name());
}
void CSimulatorXPlaneListener::checkConnectionViaPeer(const QString &address)
@@ -1382,11 +1386,11 @@ namespace swift::simplugin::xplane
if (!m_DBusConnection.isConnected())
{
// This is required to cleanup the connection in QtDBus
m_DBusConnection.disconnectFromPeer(m_DBusConnection.name());
QDBusConnection::disconnectFromPeer(m_DBusConnection.name());
return;
}
checkConnectionCommon(); // peer
m_DBusConnection.disconnectFromPeer(m_DBusConnection.name());
QDBusConnection::disconnectFromPeer(m_DBusConnection.name());
}
void CSimulatorXPlaneListener::checkConnectionCommon()
@@ -1437,7 +1441,7 @@ namespace swift::simplugin::xplane
void CSimulatorXPlaneListener::serviceRegistered(const QString &serviceName)
{
if (serviceName == xswiftbusServiceName()) { emit simulatorStarted(getPluginInfo()); }
m_DBusConnection.disconnectFromBus(m_DBusConnection.name());
QDBusConnection::disconnectFromBus(m_DBusConnection.name());
}
void CSimulatorXPlaneListener::onXSwiftBusServerSettingChanged()

80
src/plugins/simulator/xplane/simulatorxplane.h
View File

@@ -123,49 +123,48 @@ namespace swift::simplugin::xplane
swift::misc::network::IClientProvider *clientProvider, QObject *parent = nullptr);
//! Dtor
virtual ~CSimulatorXPlane() override;
~CSimulatorXPlane() override;
//! \name ISimulator implementations
//! @{
virtual bool connectTo() override;
virtual bool disconnectFrom() override;
virtual bool updateOwnSimulatorCockpit(const swift::misc::simulation::CSimulatedAircraft &aircraft,
const swift::misc::CIdentifier &originator) override;
virtual bool updateOwnSimulatorSelcal(const swift::misc::aviation::CSelcal &selcal,
const swift::misc::CIdentifier &originator) override;
virtual void displayStatusMessage(const swift::misc::CStatusMessage &message) const override;
virtual void displayTextMessage(const swift::misc::network::CTextMessage &message) const override;
virtual bool isPhysicallyRenderedAircraft(const swift::misc::aviation::CCallsign &callsign) const override;
virtual swift::misc::aviation::CCallsignSet physicallyRenderedAircraft() const override;
virtual bool followAircraft(const swift::misc::aviation::CCallsign &callsign) override;
virtual void unload() override;
virtual QString getStatisticsSimulatorSpecific() const override;
virtual void resetAircraftStatistics() override;
virtual swift::misc::CStatusMessageList
bool connectTo() override;
bool disconnectFrom() override;
bool updateOwnSimulatorCockpit(const swift::misc::simulation::CSimulatedAircraft &aircraft,
const swift::misc::CIdentifier &originator) override;
bool updateOwnSimulatorSelcal(const swift::misc::aviation::CSelcal &selcal,
const swift::misc::CIdentifier &originator) override;
void displayStatusMessage(const swift::misc::CStatusMessage &message) const override;
void displayTextMessage(const swift::misc::network::CTextMessage &message) const override;
bool isPhysicallyRenderedAircraft(const swift::misc::aviation::CCallsign &callsign) const override;
swift::misc::aviation::CCallsignSet physicallyRenderedAircraft() const override;
bool followAircraft(const swift::misc::aviation::CCallsign &callsign) override;
void unload() override;
QString getStatisticsSimulatorSpecific() const override;
void resetAircraftStatistics() override;
swift::misc::CStatusMessageList
getInterpolationMessages(const swift::misc::aviation::CCallsign &callsign) const override;
virtual bool testSendSituationAndParts(const swift::misc::aviation::CCallsign &callsign,
const swift::misc::aviation::CAircraftSituation &situation,
const swift::misc::aviation::CAircraftParts &parts) override;
virtual void callbackReceivedRequestedElevation(const swift::misc::geo::CElevationPlane &plane,
const swift::misc::aviation::CCallsign &callsign,
bool isWater) override;
virtual void setFlightNetworkConnected(bool connected) override;
bool testSendSituationAndParts(const swift::misc::aviation::CCallsign &callsign,
const swift::misc::aviation::CAircraftSituation &situation,
const swift::misc::aviation::CAircraftParts &parts) override;
void callbackReceivedRequestedElevation(const swift::misc::geo::CElevationPlane &plane,
const swift::misc::aviation::CCallsign &callsign,
bool isWater) override;
void setFlightNetworkConnected(bool connected) override;
//! @}
//! \copydoc swift::misc::simulation::ISimulationEnvironmentProvider::requestElevation
virtual bool requestElevation(const swift::misc::geo::ICoordinateGeodetic &reference,
const swift::misc::aviation::CCallsign &callsign) override;
bool requestElevation(const swift::misc::geo::ICoordinateGeodetic &reference,
const swift::misc::aviation::CCallsign &callsign) override;
protected:
//! \name ISimulator implementations
//! @{
virtual bool isConnected() const override;
virtual bool
physicallyAddRemoteAircraft(const swift::misc::simulation::CSimulatedAircraft &newRemoteAircraft) override;
virtual bool physicallyRemoveRemoteAircraft(const swift::misc::aviation::CCallsign &callsign) override;
virtual int physicallyRemoveAllRemoteAircraft() override;
virtual void clearAllRemoteAircraftData() override;
virtual bool isPaused() const override
bool isConnected() const override;
bool physicallyAddRemoteAircraft(const swift::misc::simulation::CSimulatedAircraft &newRemoteAircraft) override;
bool physicallyRemoveRemoteAircraft(const swift::misc::aviation::CCallsign &callsign) override;
int physicallyRemoveAllRemoteAircraft() override;
void clearAllRemoteAircraftData() override;
bool isPaused() const override
{
//! \todo XP: provide correct pause state
return false;
@@ -307,13 +306,13 @@ namespace swift::simplugin::xplane
protected:
//! \copydoc swift::core::ISimulatorListener::startImpl
virtual void startImpl() override;
void startImpl() override;
//! \copydoc swift::core::ISimulatorListener::stopImpl
virtual void stopImpl() override;
void stopImpl() override;
//! \copydoc swift::core::ISimulatorListener::checkImpl
virtual void checkImpl() override;
void checkImpl() override;
private:
void checkConnection();
@@ -341,14 +340,13 @@ namespace swift::simplugin::xplane
public:
//! \copydoc swift::core::ISimulatorFactory::create
virtual swift::core::ISimulator *
create(const swift::misc::simulation::CSimulatorPluginInfo &info,
swift::misc::simulation::IOwnAircraftProvider *ownAircraftProvider,
swift::misc::simulation::IRemoteAircraftProvider *remoteAircraftProvider,
swift::misc::network::IClientProvider *clientProvider) override;
swift::core::ISimulator *create(const swift::misc::simulation::CSimulatorPluginInfo &info,
swift::misc::simulation::IOwnAircraftProvider *ownAircraftProvider,
swift::misc::simulation::IRemoteAircraftProvider *remoteAircraftProvider,
swift::misc::network::IClientProvider *clientProvider) override;
//! \copydoc swift::core::ISimulatorFactory::createListener
virtual swift::core::ISimulatorListener *
swift::core::ISimulatorListener *
createListener(const swift::misc::simulation::CSimulatorPluginInfo &info) override
{
return new CSimulatorXPlaneListener(info);

4
src/plugins/simulator/xplane/xplanempaircraft.cpp
View File

@@ -13,8 +13,6 @@ using namespace swift::misc::simulation;
namespace swift::simplugin::xplane
{
CXPlaneMPAircraft::CXPlaneMPAircraft() {}
CXPlaneMPAircraft::CXPlaneMPAircraft(const CSimulatedAircraft &aircraft, ISimulator *simulator,
CInterpolationLogger *logger)
: m_aircraft(aircraft),
@@ -56,7 +54,7 @@ namespace swift::simplugin::xplane
return this->getInterpolator() ? this->getInterpolator()->getInterpolationMessages(mode) : CStatusMessageList();
}
CCallsignSet CXPlaneMPAircraftObjects::getAllCallsigns() const { return CCallsignSet(this->keys()); }
CCallsignSet CXPlaneMPAircraftObjects::getAllCallsigns() const { return { this->keys() }; }
QStringList CXPlaneMPAircraftObjects::getAllCallsignStrings(bool sorted) const
{

4
src/plugins/simulator/xplane/xplanempaircraft.h
View File

@@ -23,14 +23,14 @@ namespace swift::simplugin::xplane
{
public:
//! Constructor
CXPlaneMPAircraft();
CXPlaneMPAircraft() = default;
//! Constructor providing initial situation/parts
CXPlaneMPAircraft(const swift::misc::simulation::CSimulatedAircraft &aircraft,
swift::core::ISimulator *simulator, swift::misc::simulation::CInterpolationLogger *logger);
//! Destructor
~CXPlaneMPAircraft() {}
~CXPlaneMPAircraft() = default;
//! Set simulated aircraft
void setSimulatedAircraft(const swift::misc::simulation::CSimulatedAircraft &simulatedAircraft);

2
src/plugins/simulator/xplane/xswiftbusserviceproxy.cpp
View File

@@ -21,7 +21,7 @@ namespace swift::simplugin::xplane
InterfaceName(), connection, this);
if (!dummy)
{
bool s;
bool s {};
s = connection.connect(
QString(), "/xswiftbus/service", "org.swift_project.xswiftbus.service", "aircraftModelChanged", this,
SIGNAL(aircraftModelChanged(QString, QString, QString, QString, QString, QString, QString)));

2
src/plugins/simulator/xplane/xswiftbustrafficproxy.cpp
View File

@@ -32,7 +32,7 @@ namespace swift::simplugin::xplane
connection, this);
if (!dummy)
{
bool s;
bool s {};
s = connection.connect(QString(), "/xswiftbus/traffic", "org.swift_project.xswiftbus.traffic", "simFrame",
this, SIGNAL(simFrame()));
Q_ASSERT(s);

2
src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.cpp
View File

@@ -16,7 +16,7 @@ namespace swift::simplugin::xplane
swift::gui::CPluginConfigWindow *CSimulatorXPlaneConfig::createConfigWindow(QWidget *parent)
{
CSimulatorXPlaneConfigWindow *w = new CSimulatorXPlaneConfigWindow(parent);
auto *w = new CSimulatorXPlaneConfigWindow(parent);
return w;
}
} // namespace swift::simplugin::xplane

2
src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.h
View File

@@ -34,7 +34,7 @@ namespace swift::simplugin::xplane
CSimulatorXPlaneConfig(QObject *parent = nullptr);
//! Dtor
virtual ~CSimulatorXPlaneConfig() override {}
~CSimulatorXPlaneConfig() override = default;
//! \copydoc swift::gui::IPluginConfig::createConfigWindow()
swift::gui::CPluginConfigWindow *createConfigWindow(QWidget *parent) override;

4
src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.cpp
View File

@@ -42,7 +42,7 @@ namespace swift::simplugin::xplane
connect(ui->bb_OkCancel, &QDialogButtonBox::rejected, this, &CSimulatorXPlaneConfigWindow::close);
}
CSimulatorXPlaneConfigWindow::~CSimulatorXPlaneConfigWindow() {}
CSimulatorXPlaneConfigWindow::~CSimulatorXPlaneConfigWindow() = default;
void CSimulatorXPlaneConfigWindow::onSettingsAccepted()
{
@@ -147,7 +147,7 @@ namespace swift::simplugin::xplane
int CSimulatorXPlaneConfigWindow::marginToInt(const QString &text, int defaultValue)
{
if (text.isEmpty()) { return defaultValue; }
bool ok;
bool ok {};
const int v = text.toInt(&ok);
return ok ? v : defaultValue;
}

2
src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.h
View File

@@ -32,7 +32,7 @@ namespace swift::simplugin::xplane
CSimulatorXPlaneConfigWindow(QWidget *parent);
//! Dtor.
virtual ~CSimulatorXPlaneConfigWindow() override;
~CSimulatorXPlaneConfigWindow() override;
private:
//! Settings from UI