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

refactor: Use composition over inheritance

Browse Source
This commit is contained in:
Lars Toenning
2024-12-26 11:05:38 +01:00
parent 75e5e73eee
commit dacf2c5863
4 changed files with 11 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/airspacemonitor.cpp
View File

@@ -57,9 +57,8 @@ namespace swift::core
CAirspaceMonitor::CAirspaceMonitor(IOwnAircraftProvider *ownAircraftProvider,
IAircraftModelSetProvider *modelSetProvider, CFSDClient *fsdClient,
QObject *parent)
: CRemoteAircraftProvider(parent), COwnAircraftAware(ownAircraftProvider),
CAircraftModelSetAware(modelSetProvider), m_fsdClient(fsdClient),
m_analyzer(new CAirspaceAnalyzer(ownAircraftProvider, m_fsdClient, this))
: CRemoteAircraftProvider(parent), COwnAircraftAware(ownAircraftProvider), m_modelSetProvider(modelSetProvider),
m_fsdClient(fsdClient), m_analyzer(new CAirspaceAnalyzer(ownAircraftProvider, m_fsdClient, this))
{
this->setObjectName("CAirspaceMonitor");
this->enableReverseLookupMessages(sApp->isDeveloperFlagSet() || CBuildConfig::isLocalDeveloperDebugBuild() ?
@@ -891,7 +890,7 @@ namespace swift::core
const QString &liveryString, const QString &modelString, CAircraftModel::ModelType type,
CStatusMessageList *log, bool runMatchinScript)
{
const int modelSetCount = this->getModelSetCount();
const int modelSetCount = m_modelSetProvider->getModelSetCount();
CCallsign::addLogDetailsToList(
log, callsign, QStringLiteral("Reverse lookup (with FP data), model set count: %1").arg(modelSetCount),
CAirspaceMonitor::getLogCategories());
@@ -901,7 +900,7 @@ namespace swift::core
if (hasAnyId) { this->markAsSwiftClient(callsign); }
CAircraftModel lookupModel; // result
const CAircraftModelList modelSet = this->getModelSet();
const CAircraftModelList modelSet = m_modelSetProvider->getModelSet();
const CAircraftMatcherSetup setup = m_matchingSettings.get();
do {
// directly check model string

4
src/core/airspacemonitor.h
View File

@@ -58,8 +58,7 @@ namespace swift::core
// CAirspaceMonitor
public swift::misc::network::CClientProvider, // those data will be provided from the class CAirspaceMonitor
public swift::misc::simulation::COwnAircraftAware, // used to obtain in memory information about own aircraft
public swift::misc::simulation::CSimulationEnvironmentAware, // elevation info etc. from simulator
public swift::misc::simulation::CAircraftModelSetAware // model set for reverse lookup
public swift::misc::simulation::CSimulationEnvironmentAware // elevation info etc. from simulator
{
// CRemoteAircraftProvider is QObject
Q_OBJECT
@@ -279,6 +278,7 @@ namespace swift::core
}; //!< settings
QQueue<swift::misc::aviation::CCallsign> m_queryAtis; //!< query the ATIS
QQueue<swift::misc::aviation::CCallsign> m_queryPilot; //!< query the pilot data
misc::simulation::IAircraftModelSetProvider *m_modelSetProvider = nullptr; //!< model set for reverse lookup
fsd::CFSDClient *m_fsdClient = nullptr; //!< corresponding network interface
CAirspaceAnalyzer *m_analyzer = nullptr; //!< owned analyzer
int m_maxDistanceNM = 125; //!< position range / FSD range

21
src/misc/simulation/aircraftmodelsetprovider.cpp
View File

@@ -1,23 +1,8 @@
// SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors
// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
#include "misc/simulation/aircraftmodelsetprovider.h"
namespace swift::misc::simulation
{
// pin vtables to this file
void CAircraftModelSetAware::anchor() {}
CAircraftModelList CAircraftModelSetAware::getModelSet() const
{
if (!this->hasProvider()) { return CAircraftModelList(); }
return this->provider()->getModelSet();
}
int CAircraftModelSetAware::getModelSetCount() const
{
if (!this->hasProvider()) { return -1; }
return this->provider()->getModelSetCount();
}
} // namespace swift::misc::simulation
// pin vtable to this file
void IAircraftModelSetProvider::anchor() {}
} // namespace swift::misc::simulation

25
src/misc/simulation/aircraftmodelsetprovider.h
View File

@@ -15,6 +15,8 @@ namespace swift::misc::simulation
//! Value object encapsulating a list of aircraft models
class SWIFT_MISC_EXPORT IAircraftModelSetProvider : public IProvider
{
virtual void anchor();
public:
//! Get the model set models
virtual CAircraftModelList getModelSet() const = 0;
@@ -26,29 +28,6 @@ namespace swift::misc::simulation
IAircraftModelSetProvider() = default;
};
//! Delegating class which can be directly used to access an \sa IAircraftModelSetProvider instance
class SWIFT_MISC_EXPORT CAircraftModelSetAware : public IProviderAware<IAircraftModelSetProvider>
{
virtual void anchor();
public:
//! Set the provider
void setAircraftModelSetProvider(IAircraftModelSetProvider *provider) { this->setProvider(provider); }
//! \copydoc IAircraftModelSetProvider::getModelSet
CAircraftModelList getModelSet() const;
//! \copydoc IAircraftModelSetProvider::getModelSetCount
int getModelSetCount() const;
protected:
//! Constructor
CAircraftModelSetAware(IAircraftModelSetProvider *modelSetProvider) : IProviderAware(modelSetProvider)
{
Q_ASSERT(modelSetProvider);
}
};
} // namespace swift::misc::simulation
Q_DECLARE_INTERFACE(swift::misc::simulation::IAircraftModelSetProvider,