flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 14:55:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix doxygen warnings

Browse Source 
Fixes #188
This commit is contained in:
Lars Toenning
2023-04-02 13:21:39 +02:00
parent 7691e42a5b
commit 72ac4e6b47
50 changed files with 1008 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
samples/cliclient/client.h
View File

@@ -103,9 +103,11 @@ namespace BlackSample
void sendPingCmd(QTextStream &args);
void sendMetarQueryCmd(QTextStream &args);
signals: //to send to INetwork
signals:
//! \name Signals to INetwork
//! @{
//! to send to INetwork
void presetServer(const BlackMisc::Network::CServer &server);
void presetCallsign(const BlackMisc::Aviation::CCallsign &callsign);
void presetRealName(const QString &name);
@@ -134,6 +136,8 @@ namespace BlackSample
public slots:
//! \name Slots connected to INetwork
//! @{
//! Slots connected to INetwork
void atcPositionUpdate(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::PhysicalQuantities::CFrequency &freq,
const BlackMisc::Geo::CCoordinateGeodetic &pos, const BlackMisc::PhysicalQuantities::CLength &range);
void atcDisconnected(const BlackMisc::Aviation::CCallsign &callsign);

2
src/blackcore/airspacemonitor.h
View File

@@ -173,7 +173,7 @@ namespace BlackCore
static QString enumToString(MatchingReadiness r);
//! @}
//! \addtogroup swiftdotcommands
//! \ingroup swiftdotcommands
//! <pre>
//! .fsd range distance max.range e.g. ".fsd range 100NM"
//! </pre>

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

@@ -33,12 +33,12 @@
// clazy:excludeall=const-signal-or-slot
//! \ingroup dbus
//! DBus interface for context
//! \addtogroup dbus
#define BLACKCORE_CONTEXTAPPLICATION_INTERFACENAME "org.swift_project.blackcore.contextapplication"
//! \ingroup dbus
//! DBus object path for context
//! \addtogroup dbus
#define BLACKCORE_CONTEXTAPPLICATION_OBJECTPATH "/application"
class QDBusConnection;

37
src/blackcore/context/contextapplicationimpl.h
View File

@@ -46,24 +46,61 @@ namespace BlackCore
friend class IContextApplication;
public slots:
//! \copydoc BlackCore::Context::IContextApplication::changeSettings
virtual void changeSettings(const BlackMisc::CValueCachePacket &settings, const BlackMisc::CIdentifier &origin) override;
//! \copydoc BlackCore::Context::IContextApplication::getAllSettings
virtual BlackMisc::CValueCachePacket getAllSettings() const override;
//! \copydoc BlackCore::Context::IContextApplication::getUnsavedSettingsKeys
virtual QStringList getUnsavedSettingsKeys() const override;
//! \copydoc BlackCore::Context::IContextApplication::getUnsavedSettingsKeysDescribed
virtual BlackCore::Context::CSettingsDictionary getUnsavedSettingsKeysDescribed() const override;
//! \copydoc BlackCore::Context::IContextApplication::synchronizeLocalSettings
virtual void synchronizeLocalSettings() override;
//! \copydoc BlackCore::Context::IContextApplication::saveSettings
virtual BlackMisc::CStatusMessage saveSettings(const QString &keyPrefix = {}) override;
//! \copydoc BlackCore::Context::IContextApplication::saveSettingsByKey
virtual BlackMisc::CStatusMessage saveSettingsByKey(const QStringList &keys) override;
//! \copydoc BlackCore::Context::IContextApplication::loadSettings
virtual BlackMisc::CStatusMessage loadSettings() override;
//! \copydoc BlackCore::Context::IContextApplication::registerHotkeyActions
virtual void registerHotkeyActions(const QStringList &actions, const BlackMisc::CIdentifier &origin) override;
//! \copydoc BlackCore::Context::IContextApplication::callHotkeyActionRemotely
virtual void callHotkeyActionRemotely(const QString &action, bool argument, const BlackMisc::CIdentifier &origin) override;
//! \copydoc BlackCore::Context::IContextApplication::writeToFile
virtual bool writeToFile(const QString &fileName, const QString &content) override;
//! \copydoc BlackCore::Context::IContextApplication::registerApplication
virtual BlackMisc::CIdentifier registerApplication(const BlackMisc::CIdentifier &application) override;
//! \copydoc BlackCore::Context::IContextApplication::unregisterApplication
virtual void unregisterApplication(const BlackMisc::CIdentifier &application) override;
//! \copydoc BlackCore::Context::IContextApplication::getRegisteredApplications
virtual BlackMisc::CIdentifierList getRegisteredApplications() const override;
//! \copydoc BlackCore::Context::IContextApplication::getApplicationIdentifier
virtual BlackMisc::CIdentifier getApplicationIdentifier() const override;
//! \copydoc BlackCore::Context::IContextApplication::readFromFile
virtual QString readFromFile(const QString &fileName) const override;
//! \copydoc BlackCore::Context::IContextApplication::removeFile
virtual bool removeFile(const QString &fileName) override;
//! \copydoc BlackCore::Context::IContextApplication::existsFile
virtual bool existsFile(const QString &fileName) const override;
//! \copydoc BlackCore::Context::IContextApplication::dotCommandsHtmlHelp
virtual QString dotCommandsHtmlHelp() const override;
protected:

37
src/blackcore/context/contextapplicationproxy.h
View File

@@ -49,24 +49,61 @@ namespace BlackCore
virtual ~CContextApplicationProxy() override {}
public slots:
//! \copydoc BlackCore::Context::IContextApplication::changeSettings
virtual void changeSettings(const BlackMisc::CValueCachePacket &settings, const BlackMisc::CIdentifier &origin) override;
//! \copydoc BlackCore::Context::IContextApplication::getAllSettings
virtual BlackMisc::CValueCachePacket getAllSettings() const override;
//! \copydoc BlackCore::Context::IContextApplication::getUnsavedSettingsKeys
virtual QStringList getUnsavedSettingsKeys() const override;
//! \copydoc BlackCore::Context::IContextApplication::getUnsavedSettingsKeysDescribed
virtual BlackCore::Context::CSettingsDictionary getUnsavedSettingsKeysDescribed() const override;
//! \copydoc BlackCore::Context::IContextApplication::synchronizeLocalSettings
virtual void synchronizeLocalSettings() override;
//! \copydoc BlackCore::Context::IContextApplication::saveSettings
virtual BlackMisc::CStatusMessage saveSettings(const QString &keyPrefix = {}) override;
//! \copydoc BlackCore::Context::IContextApplication::saveSettingsByKey
virtual BlackMisc::CStatusMessage saveSettingsByKey(const QStringList &keys) override;
//! \copydoc BlackCore::Context::IContextApplication::loadSettings
virtual BlackMisc::CStatusMessage loadSettings() override;
//! \copydoc BlackCore::Context::IContextApplication::registerHotkeyActions
virtual void registerHotkeyActions(const QStringList &actions, const BlackMisc::CIdentifier &origin) override;
//! \copydoc BlackCore::Context::IContextApplication::callHotkeyActionRemotely
virtual void callHotkeyActionRemotely(const QString &action, bool argument, const BlackMisc::CIdentifier &origin) override;
//! \copydoc BlackCore::Context::IContextApplication::registerApplication
virtual BlackMisc::CIdentifier registerApplication(const BlackMisc::CIdentifier &application) override;
//! \copydoc BlackCore::Context::IContextApplication::unregisterApplication
virtual void unregisterApplication(const BlackMisc::CIdentifier &application) override;
//! \copydoc BlackCore::Context::IContextApplication::getRegisteredApplications
virtual BlackMisc::CIdentifierList getRegisteredApplications() const override;
//! \copydoc BlackCore::Context::IContextApplication::getApplicationIdentifier
virtual BlackMisc::CIdentifier getApplicationIdentifier() const override;
//! \copydoc BlackCore::Context::IContextApplication::writeToFile
virtual bool writeToFile(const QString &fileName, const QString &content) override;
//! \copydoc BlackCore::Context::IContextApplication::readFromFile
virtual QString readFromFile(const QString &fileName) const override;
//! \copydoc BlackCore::Context::IContextApplication::removeFile
virtual bool removeFile(const QString &fileName) override;
//! \copydoc BlackCore::Context::IContextApplication::existsFile
virtual bool existsFile(const QString &fileName) const override;
//! \copydoc BlackCore::Context::IContextApplication::dotCommandsHtmlHelp
virtual QString dotCommandsHtmlHelp() const override;
//! Used to test if there is a core running?

6
src/blackcore/context/contextaudio.h
View File

@@ -43,12 +43,12 @@
// clazy:excludeall=const-signal-or-slot
//! \ingroup dbus
//! DBus interface for context
//! \addtogroup dbus
#define BLACKCORE_CONTEXTAUDIO_INTERFACENAME "org.swift_project.blackcore.contextaudio"
//! \ingroup dbus
//! DBus object path for context
//! \addtogroup dbus
#define BLACKCORE_CONTEXTAUDIO_OBJECTPATH "/audio"
class QDBusConnection;
@@ -255,7 +255,7 @@ namespace BlackCore
//! \cond
//! Parse command line
//! \addtogroup swiftdotcommands
//! \ingroup swiftdotcommands
//! <pre>
//! .mute mute BlackCore::Context::CContextAudioBase
//! .unmute unmute BlackCore::Context::CContextAudioBase

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

@@ -42,12 +42,25 @@ namespace BlackCore
friend class IContextAudio;
public slots:
//! \copydoc BlackCore::Context::CContextAudioBase::getRegisteredDevices
virtual BlackMisc::Audio::CAudioDeviceInfoList getRegisteredDevices() const override;
//! \copydoc BlackCore::Context::CContextAudioBase::registerDevices
virtual void registerDevices(const BlackMisc::Audio::CAudioDeviceInfoList &devices) override;
//! \copydoc BlackCore::Context::CContextAudioBase::unRegisterDevices
virtual void unRegisterDevices(const BlackMisc::Audio::CAudioDeviceInfoList &devices) override;
//! \copydoc BlackCore::Context::CContextAudioBase::unRegisterDevicesFor
virtual void unRegisterDevicesFor(const BlackMisc::CIdentifier &identifier) override;
//! \copydoc BlackCore::Context::CContextAudioBase::registerAudioCallsign
virtual void registerAudioCallsign(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::CIdentifier &identifier) override;
//! \copydoc BlackCore::Context::CContextAudioBase::unRegisterAudioCallsign
virtual void unRegisterAudioCallsign(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::CIdentifier &identifier) override;
//! \copydoc BlackCore::Context::CContextAudioBase::hasRegisteredAudioCallsign
virtual bool hasRegisteredAudioCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override;
protected:

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

@@ -58,12 +58,25 @@ namespace BlackCore
static void unitTestRelaySignals();
public slots:
//! \copydoc BlackCore::Context::CContextAudioBase::getRegisteredDevices
virtual BlackMisc::Audio::CAudioDeviceInfoList getRegisteredDevices() const override;
//! \copydoc BlackCore::Context::CContextAudioBase::registerDevices
virtual void registerDevices(const BlackMisc::Audio::CAudioDeviceInfoList &devices) override;
//! \copydoc BlackCore::Context::CContextAudioBase::unRegisterDevices
virtual void unRegisterDevices(const BlackMisc::Audio::CAudioDeviceInfoList &devices) override;
//! \copydoc BlackCore::Context::CContextAudioBase::unRegisterDevicesFor
virtual void unRegisterDevicesFor(const BlackMisc::CIdentifier &identifier) override;
//! \copydoc BlackCore::Context::CContextAudioBase::registerAudioCallsign
virtual void registerAudioCallsign(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::CIdentifier &identifier) override;
//! \copydoc BlackCore::Context::CContextAudioBase::unRegisterAudioCallsign
virtual void unRegisterAudioCallsign(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::CIdentifier &identifier) override;
//! \copydoc BlackCore::Context::CContextAudioBase::hasRegisteredAudioCallsign
virtual bool hasRegisteredAudioCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override;
private:

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

@@ -44,12 +44,12 @@
// clazy:excludeall=const-signal-or-slot
//! \ingroup dbus
//! DBus interface for context
//! \addtogroup dbus
#define BLACKCORE_CONTEXTNETWORK_INTERFACENAME "org.swift_project.blackcore.contextnetwork"
//! \ingroup dbus
//! DBus object path for context
//! \addtogroup dbus
#define BLACKCORE_CONTEXTNETWORK_OBJECTPATH "/network"
class QDBusConnection;

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

@@ -118,6 +118,8 @@ namespace BlackCore
virtual void rememberCGFromDB(const BlackMisc::PhysicalQuantities::CLength &cgFromDB, const QString &modelString) override;
virtual BlackMisc::Simulation::CAirspaceAircraftSnapshot getLatestAirspaceAircraftSnapshot() const override;
virtual BlackMisc::Geo::CElevationPlane averageElevationOfNonMovingAircraft(const BlackMisc::Aviation::CAircraftSituation &reference, const BlackMisc::PhysicalQuantities::CLength &range, int minValues = 1, int sufficientValues = 2) const override;
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::connectRemoteAircraftProviderSignals
virtual QList<QMetaObject::Connection> connectRemoteAircraftProviderSignals(
QObject *receiver,
std::function<void(const BlackMisc::Aviation::CAircraftSituation &)> addedSituationSlot,
@@ -161,47 +163,119 @@ namespace BlackCore
// remoteaircraftprovider
// emit signal when changed
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::updateAircraftEnabled
virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRendering) override;
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::updateAircraftModel
virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::CIdentifier &originator) override;
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::updateAircraftNetworkModel
virtual bool updateAircraftNetworkModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::CIdentifier &originator) override;
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::updateFastPositionEnabled
virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositonUpdates) override;
//! \copydoc BlackCore::Context::IContextNetwork::updateAircraftSupportingGndFLag
virtual bool updateAircraftSupportingGndFLag(const BlackMisc::Aviation::CCallsign &callsign, bool supportGndFlag) override;
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::enableReverseLookupMessages
virtual void enableReverseLookupMessages(BlackMisc::Simulation::ReverseLookupLogging enable) override;
// plain vanilla passing to airspace monitor
//! \copydoc BlackCore::Context::IContextNetwork::setAircraftEnabledFlag
virtual bool setAircraftEnabledFlag(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRendering) override;
//! \copydoc BlackCore::Context::IContextNetwork::reInitializeAllAircraft
virtual int reInitializeAllAircraft() override;
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::updateCG
virtual bool updateCG(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::PhysicalQuantities::CLength &cg) override;
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::updateCGForModel
virtual BlackMisc::Aviation::CCallsignSet updateCGForModel(const QString &modelString, const BlackMisc::PhysicalQuantities::CLength &cg) override;
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::updateCGAndModelString
virtual bool updateCGAndModelString(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::PhysicalQuantities::CLength &cg, const QString &modelString) override;
//! \copydoc BlackCore::Context::IContextNetwork::getAircraftInRange
virtual BlackMisc::Simulation::CSimulatedAircraftList getAircraftInRange() const override;
//! \copydoc BlackCore::Context::IContextNetwork::getAircraftInRangeCallsigns
virtual BlackMisc::Aviation::CCallsignSet getAircraftInRangeCallsigns() const override;
//! \copydoc BlackCore::Context::IContextNetwork::getAircraftInRangeCount
virtual int getAircraftInRangeCount() const override;
//! \copydoc BlackCore::Context::IContextNetwork::isAircraftInRange
virtual bool isAircraftInRange(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::isVtolAircraft
virtual bool isVtolAircraft(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc BlackCore::Context::IContextNetwork::getAircraftInRangeForCallsign
virtual BlackMisc::Simulation::CSimulatedAircraft getAircraftInRangeForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::getAircraftInRangeModelForCallsign
virtual BlackMisc::Simulation::CAircraftModel getAircraftInRangeModelForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc BlackCore::Context::IContextNetwork::getReverseLookupMessages
virtual BlackMisc::CStatusMessageList getReverseLookupMessages(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc BlackCore::Context::IContextNetwork::isReverseLookupMessagesEnabled
virtual BlackMisc::Simulation::ReverseLookupLogging isReverseLookupMessagesEnabled() const override;
//! \copydoc BlackCore::Context::IContextNetwork::getAircraftPartsHistory
virtual BlackMisc::CStatusMessageList getAircraftPartsHistory(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc BlackCore::Context::IContextNetwork::getRemoteAircraftParts
virtual BlackMisc::Aviation::CAircraftPartsList getRemoteAircraftParts(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::getRemoteAircraftSupportingPartsCount
virtual int getRemoteAircraftSupportingPartsCount() const override;
//! \copydoc BlackCore::Context::IContextNetwork::isAircraftPartsHistoryEnabled
virtual bool isAircraftPartsHistoryEnabled() const override;
//! \copydoc BlackCore::Context::IContextNetwork::isRemoteAircraftSupportingParts
virtual bool isRemoteAircraftSupportingParts(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc BlackCore::Context::IContextNetwork::enableAircraftPartsHistory
virtual void enableAircraftPartsHistory(bool enabled) override;
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::aircraftSituationsAdded
virtual int aircraftSituationsAdded() const override;
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::aircraftPartsAdded
virtual int aircraftPartsAdded() const override;
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::situationsLastModified
virtual qint64 situationsLastModified(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::partsLastModified
virtual qint64 partsLastModified(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc BlackCore::Context::IContextNetwork::getNetworkStatistics
virtual QString getNetworkStatistics(bool reset, const QString &separator) override;
//! \copydoc BlackCore::Context::IContextNetwork::setNetworkStatisticsEnable
virtual bool setNetworkStatisticsEnable(bool enabled) override;
//! \copydoc BlackCore::Context::IContextNetwork::testAddAltitudeOffset
virtual bool testAddAltitudeOffset(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::PhysicalQuantities::CLength &offset = BlackMisc::PhysicalQuantities::CLength::null()) override;
//! \copydoc BlackCore::Context::IContextNetwork::getNetworkPresetValues
virtual QStringList getNetworkPresetValues() const override;
//! \copydoc BlackCore::Context::IContextNetwork::getPartnerCallsign
virtual BlackMisc::Aviation::CCallsign getPartnerCallsign() const override;
// clientprovider
//! \copydoc BlackMisc::Network::IClientProvider::getClients
virtual BlackMisc::Network::CClientList getClients() const override;
//! \copydoc BlackMisc::Network::IClientProvider::getClientsForCallsigns
virtual BlackMisc::Network::CClientList getClientsForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns) const override;
//! \copydoc BlackMisc::Network::IClientProvider::setOtherClient
virtual bool setOtherClient(const BlackMisc::Network::CClient &client) override;
//! In transition state, e.g. connecting, disconnecting.
@@ -210,7 +284,7 @@ namespace BlackCore
bool isPendingConnection() const;
// --------------------- IContextNetwork implementations ---------------------
//! \addtogroup swiftdotcommands
//! \ingroup swiftdotcommands
//! <pre>
//! .m .msg .chat callsign|freq. message message text
//! .altos .altoffset altitude offset for testing
@@ -240,39 +314,101 @@ namespace BlackCore
BlackMisc::CSimpleCommandParser::registerCommand({".disable callsign", "disable/ignore callsign"});
}
//! \copydoc BlackCore::Context::IContextNetwork::requestAtcBookingsUpdate
virtual void requestAtcBookingsUpdate() const override;
//! \copydoc BlackCore::Context::IContextNetwork::getAtcStationsBooked
virtual BlackMisc::Aviation::CAtcStationList getAtcStationsBooked(bool recalculateDistance) const override;
//! \copydoc BlackCore::Context::IContextNetwork::getAtcStationsOnline
virtual BlackMisc::Aviation::CAtcStationList getAtcStationsOnline(bool recalculateDistance) const override;
//! \copydoc BlackCore::Context::IContextNetwork::getClosestAtcStationsOnline
virtual BlackMisc::Aviation::CAtcStationList getClosestAtcStationsOnline(int number) const override;
//! \copydoc BlackCore::Context::IContextNetwork::getOnlineStationForCallsign
virtual BlackMisc::Aviation::CAtcStation getOnlineStationForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc BlackCore::Context::IContextNetwork::getOnlineStationsForFrequency
virtual BlackMisc::Aviation::CAtcStationList getOnlineStationsForFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency) const override;
//! \copydoc BlackCore::Context::IContextNetwork::isOnlineStation
virtual bool isOnlineStation(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc BlackCore::Context::IContextNetwork::connectToNetwork
virtual BlackMisc::CStatusMessage connectToNetwork(const BlackMisc::Network::CServer &server, const QString &extraLiveryString, bool sendLivery, const QString &extraModelString, bool sendModelString, const BlackMisc::Aviation::CCallsign &partnerCallsign, BlackMisc::Network::CLoginMode mode) override;
//! \copydoc BlackCore::Context::IContextNetwork::getConnectedServer
virtual BlackMisc::Network::CServer getConnectedServer() const override;
//! \copydoc BlackCore::Context::IContextNetwork::getLoginMode
virtual BlackMisc::Network::CLoginMode getLoginMode() const override;
//! \copydoc BlackCore::Context::IContextNetwork::disconnectFromNetwork
virtual BlackMisc::CStatusMessage disconnectFromNetwork() override;
//! \copydoc BlackCore::Context::IContextNetwork::isConnected
virtual bool isConnected() const override;
//! \copydoc BlackCore::Context::IContextNetwork::sendTextMessages
virtual void sendTextMessages(const BlackMisc::Network::CTextMessageList &textMessages) override;
//! \copydoc BlackCore::Context::IContextNetwork::sendFlightPlan
virtual void sendFlightPlan(const BlackMisc::Aviation::CFlightPlan &flightPlan) override;
//! \copydoc BlackCore::Context::IContextNetwork::loadFlightPlanFromNetwork
virtual BlackMisc::Aviation::CFlightPlan loadFlightPlanFromNetwork(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc BlackCore::Context::IContextNetwork::getMetarForAirport
BlackMisc::Weather::CMetar getMetarForAirport(const BlackMisc::Aviation::CAirportIcaoCode &airportIcaoCode) const override;
//! \copydoc BlackCore::Context::IContextNetwork::getSelectedAtcStations
virtual BlackMisc::Aviation::CAtcStationList getSelectedAtcStations() const override;
//! \copydoc BlackCore::Context::IContextNetwork::getUsers
virtual BlackMisc::Network::CUserList getUsers() const override;
//! \copydoc BlackCore::Context::IContextNetwork::getUsersForCallsigns
virtual BlackMisc::Network::CUserList getUsersForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns) const override;
//! \copydoc BlackCore::Context::IContextNetwork::getUserForCallsign
virtual BlackMisc::Network::CUser getUserForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc BlackCore::Context::IContextNetwork::getVatsimFsdServers
virtual BlackMisc::Network::CServerList getVatsimFsdServers() const override;
//! \copydoc BlackCore::Context::IContextNetwork::getVatsimVoiceServers
virtual BlackMisc::Network::CServerList getVatsimVoiceServers() const override;
//! \copydoc BlackCore::Context::IContextNetwork::requestAircraftDataUpdates
virtual void requestAircraftDataUpdates()override;
//! \copydoc BlackCore::Context::IContextNetwork::requestAtisUpdates
virtual void requestAtisUpdates() override;
//! \copydoc BlackCore::Context::IContextNetwork::setFastPositionEnabledCallsigns
virtual void setFastPositionEnabledCallsigns(BlackMisc::Aviation::CCallsignSet &callsigns) override;
//! \copydoc BlackCore::Context::IContextNetwork::getFastPositionEnabledCallsigns
virtual BlackMisc::Aviation::CCallsignSet getFastPositionEnabledCallsigns() const override;
//! \copydoc BlackCore::Context::IContextNetwork::getLibraryInfo
virtual QString getLibraryInfo(bool detailed) const override;
//! \copydoc BlackCore::Context::IContextNetwork::testCreateDummyOnlineAtcStations
virtual void testCreateDummyOnlineAtcStations(int number) override;
//! \copydoc BlackCore::Context::IContextNetwork::testAddAircraftParts
virtual void testAddAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftParts &parts, bool incremental) override;
//! \copydoc BlackCore::Context::IContextNetwork::testReceivedAtisMessage
virtual void testReceivedAtisMessage(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CInformationMessage &msg) override;
//! \copydoc BlackCore::Context::IContextNetwork::testReceivedTextMessages
virtual void testReceivedTextMessages(const BlackMisc::Network::CTextMessageList &textMessages) override;
//! \copydoc BlackCore::Context::IContextNetwork::testRequestAircraftConfig
virtual void testRequestAircraftConfig(const BlackMisc::Aviation::CCallsign &callsign) override;
// --------------------- IContextNetwork implementations ---------------------
protected:
//! Constructor, with link to runtime

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

@@ -74,66 +74,188 @@ namespace BlackCore
public slots:
//! \name Interface overrides
//! @{
//! \copydoc BlackCore::Context::IContextNetwork::requestAtcBookingsUpdate
virtual void requestAtcBookingsUpdate() const override;
//! \copydoc BlackCore::Context::IContextNetwork::getAtcStationsOnline
virtual BlackMisc::Aviation::CAtcStationList getAtcStationsOnline(bool recalculateDistance) const override;
//! \copydoc BlackCore::Context::IContextNetwork::getClosestAtcStationsOnline
virtual BlackMisc::Aviation::CAtcStationList getClosestAtcStationsOnline(int number) const override;
//! \copydoc BlackCore::Context::IContextNetwork::getAtcStationsBooked
virtual BlackMisc::Aviation::CAtcStationList getAtcStationsBooked(bool recalculateDistance) const override;
//! \copydoc BlackCore::Context::IContextNetwork::getAircraftInRange
virtual BlackMisc::Simulation::CSimulatedAircraftList getAircraftInRange() const override;
//! \copydoc BlackCore::Context::IContextNetwork::getAircraftInRangeCallsigns
virtual BlackMisc::Aviation::CCallsignSet getAircraftInRangeCallsigns() const override;
//! \copydoc BlackCore::Context::IContextNetwork::getAircraftInRangeCount
virtual int getAircraftInRangeCount() const override;
//! \copydoc BlackCore::Context::IContextNetwork::isAircraftInRange
virtual bool isAircraftInRange(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc BlackCore::Context::IContextNetwork::getAircraftInRangeForCallsign
virtual BlackMisc::Simulation::CSimulatedAircraft getAircraftInRangeForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc BlackCore::Context::IContextNetwork::getOnlineStationsForFrequency
virtual BlackMisc::Aviation::CAtcStationList getOnlineStationsForFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency) const override;
//! \copydoc BlackCore::Context::IContextNetwork::getOnlineStationForCallsign
virtual BlackMisc::Aviation::CAtcStation getOnlineStationForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc BlackCore::Context::IContextNetwork::isOnlineStation
virtual bool isOnlineStation(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc BlackCore::Context::IContextNetwork::connectToNetwork
virtual BlackMisc::CStatusMessage connectToNetwork(const BlackMisc::Network::CServer &server, const QString &extraLiveryString, bool sendLivery, const QString &extraModelString, bool sendModelString, const BlackMisc::Aviation::CCallsign &partnerCallsign, BlackMisc::Network::CLoginMode mode) override;
//! \copydoc BlackCore::Context::IContextNetwork::disconnectFromNetwork
virtual BlackMisc::CStatusMessage disconnectFromNetwork() override;
//! \copydoc BlackCore::Context::IContextNetwork::isConnected
virtual bool isConnected() const override;
//! \copydoc BlackCore::Context::IContextNetwork::getConnectedServer
virtual BlackMisc::Network::CServer getConnectedServer() const override;
//! \copydoc BlackCore::Context::IContextNetwork::getLoginMode
virtual BlackMisc::Network::CLoginMode getLoginMode() const override;
//! \copydoc BlackCore::Context::IContextNetwork::parseCommandLine
virtual bool parseCommandLine(const QString &commandLine, const BlackMisc::CIdentifier &originator) override;
//! \copydoc BlackCore::Context::IContextNetwork::sendTextMessages
virtual void sendTextMessages(const BlackMisc::Network::CTextMessageList &textMessages) override;
//! \copydoc BlackCore::Context::IContextNetwork::sendFlightPlan
virtual void sendFlightPlan(const BlackMisc::Aviation::CFlightPlan &flightPlan) override;
//! \copydoc BlackCore::Context::IContextNetwork::loadFlightPlanFromNetwork
virtual BlackMisc::Aviation::CFlightPlan loadFlightPlanFromNetwork(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc BlackCore::Context::IContextNetwork::getMetarForAirport
BlackMisc::Weather::CMetar getMetarForAirport(const BlackMisc::Aviation::CAirportIcaoCode &airportIcaoCode) const override;
//! \copydoc BlackCore::Context::IContextNetwork::getSelectedAtcStations
virtual BlackMisc::Aviation::CAtcStationList getSelectedAtcStations() const override;
//! \copydoc BlackCore::Context::IContextNetwork::getUsers
virtual BlackMisc::Network::CUserList getUsers() const override;
//! \copydoc BlackCore::Context::IContextNetwork::getUsersForCallsigns
virtual BlackMisc::Network::CUserList getUsersForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns) const override;
//! \copydoc BlackCore::Context::IContextNetwork::getUserForCallsign
virtual BlackMisc::Network::CUser getUserForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc BlackCore::Context::IContextNetwork::getClients
virtual BlackMisc::Network::CClientList getClients() const override;
//! \copydoc BlackCore::Context::IContextNetwork::getVatsimVoiceServers
virtual BlackMisc::Network::CServerList getVatsimVoiceServers() const override;
//! \copydoc BlackCore::Context::IContextNetwork::getVatsimFsdServers
virtual BlackMisc::Network::CServerList getVatsimFsdServers() const override;
//! \copydoc BlackCore::Context::IContextNetwork::getClientsForCallsigns
virtual BlackMisc::Network::CClientList getClientsForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns) const override;
//! \copydoc BlackCore::Context::IContextNetwork::setOtherClient
virtual bool setOtherClient(const BlackMisc::Network::CClient &client) override;
//! \copydoc BlackCore::Context::IContextNetwork::requestAircraftDataUpdates
virtual void requestAircraftDataUpdates()override;
//! \copydoc BlackCore::Context::IContextNetwork::requestAtisUpdates
virtual void requestAtisUpdates() override;
//! \copydoc BlackCore::Context::IContextNetwork::updateAircraftEnabled
virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRendering) override;
//! \copydoc BlackCore::Context::IContextNetwork::setAircraftEnabledFlag
virtual bool setAircraftEnabledFlag(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRendering) override;
//! \copydoc BlackCore::Context::IContextNetwork::updateAircraftModel
virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::CIdentifier &originator) override;
//! \copydoc BlackCore::Context::IContextNetwork::updateAircraftNetworkModel
virtual bool updateAircraftNetworkModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::CIdentifier &originator) override;
//! \copydoc BlackCore::Context::IContextNetwork::updateFastPositionEnabled
virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositionSending) override;
//! \copydoc BlackCore::Context::IContextNetwork::updateAircraftSupportingGndFLag
virtual bool updateAircraftSupportingGndFLag(const BlackMisc::Aviation::CCallsign &callsign, bool supportGndFlag) override;
//! \copydoc BlackCore::Context::IContextNetwork::reInitializeAllAircraft
virtual int reInitializeAllAircraft() override;
//! \copydoc BlackCore::Context::IContextNetwork::setFastPositionEnabledCallsigns
virtual void setFastPositionEnabledCallsigns(BlackMisc::Aviation::CCallsignSet &callsigns) override;
//! \copydoc BlackCore::Context::IContextNetwork::getFastPositionEnabledCallsigns
virtual BlackMisc::Aviation::CCallsignSet getFastPositionEnabledCallsigns() const override;
//! \copydoc BlackCore::Context::IContextNetwork::getReverseLookupMessages
virtual BlackMisc::CStatusMessageList getReverseLookupMessages(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc BlackCore::Context::IContextNetwork::isReverseLookupMessagesEnabled
virtual BlackMisc::Simulation::ReverseLookupLogging isReverseLookupMessagesEnabled() const override;
//! \copydoc BlackCore::Context::IContextNetwork::enableReverseLookupMessages
virtual void enableReverseLookupMessages(BlackMisc::Simulation::ReverseLookupLogging enable) override;
//! \copydoc BlackCore::Context::IContextNetwork::getAircraftPartsHistory
virtual BlackMisc::CStatusMessageList getAircraftPartsHistory(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc BlackCore::Context::IContextNetwork::getRemoteAircraftParts
virtual BlackMisc::Aviation::CAircraftPartsList getRemoteAircraftParts(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc BlackCore::Context::IContextNetwork::getLibraryInfo
virtual QString getLibraryInfo(bool detailed) const override;
//! \copydoc BlackCore::Context::IContextNetwork::isAircraftPartsHistoryEnabled
virtual bool isAircraftPartsHistoryEnabled() const override;
//! \copydoc BlackCore::Context::IContextNetwork::isRemoteAircraftSupportingParts
virtual bool isRemoteAircraftSupportingParts(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc BlackCore::Context::IContextNetwork::enableAircraftPartsHistory
virtual void enableAircraftPartsHistory(bool enabled) override;
//! \copydoc BlackCore::Context::IContextNetwork::getNetworkStatistics
virtual QString getNetworkStatistics(bool reset, const QString &separator) override;
//! \copydoc BlackCore::Context::IContextNetwork::setNetworkStatisticsEnable
virtual bool setNetworkStatisticsEnable(bool enabled) override;
//! \copydoc BlackCore::Context::IContextNetwork::getNetworkPresetValues
virtual QStringList getNetworkPresetValues() const override;
//! \copydoc BlackCore::Context::IContextNetwork::getPartnerCallsign
virtual BlackMisc::Aviation::CCallsign getPartnerCallsign() const override;
//! \copydoc BlackCore::Context::IContextNetwork::testCreateDummyOnlineAtcStations
virtual void testCreateDummyOnlineAtcStations(int number) override;
//! \copydoc BlackCore::Context::IContextNetwork::testAddAircraftParts
virtual void testAddAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftParts &parts, bool incremental) override;
//! \copydoc BlackCore::Context::IContextNetwork::testReceivedTextMessages
virtual void testReceivedTextMessages(const BlackMisc::Network::CTextMessageList &textMessages) override;
//! \copydoc BlackCore::Context::IContextNetwork::testReceivedAtisMessage
virtual void testReceivedAtisMessage(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CInformationMessage &msg) override;
//! \copydoc BlackCore::Context::IContextNetwork::testRequestAircraftConfig
virtual void testRequestAircraftConfig(const BlackMisc::Aviation::CCallsign &callsign) override;
//! \copydoc BlackCore::Context::IContextNetwork::testAddAltitudeOffset
virtual bool testAddAltitudeOffset(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::PhysicalQuantities::CLength &offset = BlackMisc::PhysicalQuantities::CLength::null()) override;
//! @}

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

@@ -29,12 +29,12 @@
// clazy:excludeall=const-signal-or-slot
//! \ingroup dbus
//! DBus interface for context
//! \addtogroup dbus
#define BLACKCORE_CONTEXTOWNAIRCRAFT_INTERFACENAME "org.swift_project.blackcore.contextownaircraft"
//! \ingroup dbus
//! DBus object path for context
//! \addtogroup dbus
#define BLACKCORE_CONTEXTOWNAIRCRAFT_OBJECTPATH "/ownaircraft"
class QDBusConnection;

2
src/blackcore/context/contextownaircraftimpl.h
View File

@@ -176,7 +176,7 @@ namespace BlackCore
//! \copydoc IContextOwnAircraft::setTransponderMode
virtual bool setTransponderMode(BlackMisc::Aviation::CTransponder::TransponderMode mode) override;
//! \addtogroup swiftdotcommands
//! \ingroup swiftdotcommands
//! <pre>
//! .x .xpdr code set transponder code BlackCore::Context::CContextOwnAircraft
//! .x .xpdr mode set transponder mode BlackCore::Context::CContextOwnAircraft

29
src/blackcore/context/contextownaircraftproxy.h
View File

@@ -62,20 +62,49 @@ namespace BlackCore
static void unitTestRelaySignals();
public slots:
//! \copydoc BlackCore::Context::IContextOwnAircraft::getOwnAircraft
virtual BlackMisc::Simulation::CSimulatedAircraft getOwnAircraft() const override;
//! \copydoc BlackCore::Context::IContextOwnAircraft::getOwnComSystem
virtual BlackMisc::Aviation::CComSystem getOwnComSystem(BlackMisc::Aviation::CComSystem::ComUnit unit) const override;
//! \copydoc BlackCore::Context::IContextOwnAircraft::getOwnTransponder
virtual BlackMisc::Aviation::CTransponder getOwnTransponder() const override;
//! \copydoc BlackCore::Context::IContextOwnAircraft::getOwnAircraftSituation
virtual BlackMisc::Aviation::CAircraftSituation getOwnAircraftSituation() const override;
//! \copydoc BlackCore::Context::IContextOwnAircraft::updateOwnPosition
virtual bool updateOwnPosition(const BlackMisc::Geo::CCoordinateGeodetic &position, const BlackMisc::Aviation::CAltitude &altitude, const BlackMisc::Aviation::CAltitude &pressureAltitude) override;
//! \copydoc BlackCore::Context::IContextOwnAircraft::updateCockpit
virtual bool updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const BlackMisc::CIdentifier &originator) override;
//! \copydoc BlackCore::Context::IContextOwnAircraft::updateTransponderMode
virtual bool updateTransponderMode(const BlackMisc::Aviation::CTransponder::TransponderMode &transponderMode, const BlackMisc::CIdentifier &originator) override;
//! \copydoc BlackCore::Context::IContextOwnAircraft::updateActiveComFrequency
virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, BlackMisc::Aviation::CComSystem::ComUnit comUnit, const BlackMisc::CIdentifier &originator) override;
//! \copydoc BlackCore::Context::IContextOwnAircraft::updateOwnAircraftPilot
virtual bool updateOwnAircraftPilot(const BlackMisc::Network::CUser &pilot) override;
//! \copydoc BlackCore::Context::IContextOwnAircraft::updateSelcal
virtual bool updateSelcal(const BlackMisc::Aviation::CSelcal &selcal, const BlackMisc::CIdentifier &originator) override;
//! \copydoc BlackCore::Context::IContextOwnAircraft::updateOwnCallsign
virtual bool updateOwnCallsign(const BlackMisc::Aviation::CCallsign &callsign) override;
//! \copydoc BlackCore::Context::IContextOwnAircraft::updateOwnIcaoCodes
virtual bool updateOwnIcaoCodes(const BlackMisc::Aviation::CAircraftIcaoCode &aircraftIcaoCode, const BlackMisc::Aviation::CAirlineIcaoCode &airlineIcaoCode) override;
//! \copydoc BlackCore::Context::IContextOwnAircraft::toggleTransponderMode
virtual void toggleTransponderMode() override;
//! \copydoc BlackCore::Context::IContextOwnAircraft::setTransponderMode
virtual bool setTransponderMode(BlackMisc::Aviation::CTransponder::TransponderMode mode) override;
//! \copydoc BlackCore::Context::IContextOwnAircraft::parseCommandLine
virtual bool parseCommandLine(const QString &commandLine, const BlackMisc::CIdentifier &originator) override;
protected:

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

@@ -40,12 +40,12 @@
// clazy:excludeall=const-signal-or-slot
//! \ingroup dbus
//! DBus interface for context
//! \addtogroup dbus
#define BLACKCORE_CONTEXTSIMULATOR_INTERFACENAME "org.swift_project.blackcore.contextsimulator"
//! \ingroup dbus
//! DBus object path for context
//! \addtogroup dbus
#define BLACKCORE_CONTEXTSIMULATOR_OBJECTPATH "/simulator"
class QDBusConnection;

114
src/blackcore/context/contextsimulatorimpl.h
View File

@@ -74,67 +74,175 @@ namespace BlackCore
friend class IContextSimulator;
public slots:
// ----------------------------- context interface -----------------------------
//! \copydoc BlackCore::Context::IContextSimulator::getSimulatorPluginInfo
virtual BlackMisc::Simulation::CSimulatorPluginInfo getSimulatorPluginInfo() const override;
//! \copydoc BlackCore::Context::IContextSimulator::getAvailableSimulatorPlugins
virtual BlackMisc::Simulation::CSimulatorPluginInfoList getAvailableSimulatorPlugins() const override;
//! \copydoc BlackCore::Context::IContextSimulator::getSimulatorSettings
virtual BlackMisc::Simulation::Settings::CSimulatorSettings getSimulatorSettings() const override;
//! \copydoc BlackCore::Context::IContextSimulator::setSimulatorSettings
virtual bool setSimulatorSettings(const BlackMisc::Simulation::Settings::CSimulatorSettings &settings, const BlackMisc::Simulation::CSimulatorInfo &simulator) override;
//! \copydoc BlackCore::Context::IContextSimulator::startSimulatorPlugin
virtual bool startSimulatorPlugin(const BlackMisc::Simulation::CSimulatorPluginInfo &simulatorInfo) override;
//! \copydoc BlackCore::Context::IContextSimulator::stopSimulatorPlugin
virtual void stopSimulatorPlugin(const BlackMisc::Simulation::CSimulatorPluginInfo &simulatorInfo) override;
//! \copydoc BlackCore::Context::IContextSimulator::checkListeners
virtual int checkListeners() override;
//! \copydoc BlackCore::Context::IContextSimulator::getSimulatorStatus
virtual int getSimulatorStatus() const override;
//! \copydoc BlackCore::Context::IContextSimulator::getSimulatorInternals
virtual BlackMisc::Simulation::CSimulatorInternals getSimulatorInternals() const override;
//! \copydoc BlackCore::Context::IContextSimulator::getAirportsInRange
virtual BlackMisc::Aviation::CAirportList getAirportsInRange(bool recalculateDistance) const override;
//! \copydoc BlackCore::Context::IContextSimulator::getModelSetLoaderSimulator
virtual BlackMisc::Simulation::CSimulatorInfo getModelSetLoaderSimulator() const override;
//! \copydoc BlackCore::Context::IContextSimulator::setModelSetLoaderSimulator
virtual void setModelSetLoaderSimulator(const BlackMisc::Simulation::CSimulatorInfo &simulator) override;
//! \copydoc BlackCore::Context::IContextSimulator::simulatorsWithInitializedModelSet
virtual BlackMisc::Simulation::CSimulatorInfo simulatorsWithInitializedModelSet() const override;
//! \copydoc BlackCore::Context::IContextSimulator::verifyPrerequisites
virtual BlackMisc::CStatusMessageList verifyPrerequisites() const override;
//! \copydoc BlackCore::Context::IContextSimulator::getModelSetStrings
virtual QStringList getModelSetStrings() const override;
//! \copydoc BlackCore::Context::IContextSimulator::getModelSetCompleterStrings
virtual QStringList getModelSetCompleterStrings(bool sorted) const override;
//! \copydoc BlackCore::Context::IContextSimulator::isKnownModelInSet
virtual bool isKnownModelInSet(const QString &modelString) const override;
//! \copydoc BlackCore::Context::IContextSimulator::removeModelsFromSet
virtual int removeModelsFromSet(const BlackMisc::Simulation::CAircraftModelList &removeModels) override;
//! \copydoc BlackCore::Context::IContextSimulator::disableModelsForMatching
virtual void disableModelsForMatching(const BlackMisc::Simulation::CAircraftModelList &removedModels, bool incremental) override;
//! \copydoc BlackCore::Context::IContextSimulator::getDisabledModelsForMatching
virtual BlackMisc::Simulation::CAircraftModelList getDisabledModelsForMatching() const override;
//! \copydoc BlackCore::Context::IContextSimulator::restoreDisabledModels
virtual void restoreDisabledModels() override;
//! \copydoc BlackCore::Context::IContextSimulator::isValidationInProgress
virtual bool isValidationInProgress() const override;
//! \copydoc BlackCore::Context::IContextSimulator::triggerModelSetValidation
virtual bool triggerModelSetValidation(const BlackMisc::Simulation::CSimulatorInfo &simulator) override;
//! \copydoc BlackCore::Context::IContextSimulator::getModelSetModelsStartingWith
virtual BlackMisc::Simulation::CAircraftModelList getModelSetModelsStartingWith(const QString &modelString) const override;
//! \copydoc BlackCore::Context::IContextSimulator::getTimeSynchronizationOffset
virtual BlackMisc::PhysicalQuantities::CTime getTimeSynchronizationOffset() const override;
//! \copydoc BlackCore::Context::IContextSimulator::setTimeSynchronization
virtual bool setTimeSynchronization(bool enable, const BlackMisc::PhysicalQuantities::CTime &offset) override;
//! \copydoc BlackCore::Context::IContextSimulator::isTimeSynchronized
virtual bool isTimeSynchronized() const override;
//! \copydoc BlackCore::Context::IContextSimulator::getInterpolationAndRenderingSetupGlobal
virtual BlackMisc::Simulation::CInterpolationAndRenderingSetupGlobal getInterpolationAndRenderingSetupGlobal() const override;
//! \copydoc BlackCore::Context::IContextSimulator::getInterpolationAndRenderingSetupsPerCallsign
virtual BlackMisc::Simulation::CInterpolationSetupList getInterpolationAndRenderingSetupsPerCallsign() const override;
//! \copydoc BlackCore::Context::IContextSimulator::getInterpolationAndRenderingSetupPerCallsignOrDefault
virtual BlackMisc::Simulation::CInterpolationAndRenderingSetupPerCallsign getInterpolationAndRenderingSetupPerCallsignOrDefault(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc BlackCore::Context::IContextSimulator::setInterpolationAndRenderingSetupsPerCallsign
virtual bool setInterpolationAndRenderingSetupsPerCallsign(const BlackMisc::Simulation::CInterpolationSetupList &setups, bool ignoreSameAsGlobal) override;
//! \copydoc BlackCore::Context::IContextSimulator::setInterpolationAndRenderingSetupGlobal
virtual void setInterpolationAndRenderingSetupGlobal(const BlackMisc::Simulation::CInterpolationAndRenderingSetupGlobal &setup) override;
//! \copydoc BlackCore::Context::IContextSimulator::getInterpolationMessages
virtual BlackMisc::CStatusMessageList getInterpolationMessages(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc BlackCore::Context::IContextSimulator::iconForModel
virtual BlackMisc::CPixmap iconForModel(const QString &modelString) const override;
//! \copydoc BlackCore::Context::IContextSimulator::highlightAircraft
virtual void highlightAircraft(const BlackMisc::Simulation::CSimulatedAircraft &aircraftToHighlight, bool enableHighlight, const BlackMisc::PhysicalQuantities::CTime &displayTime) override;
//! \copydoc BlackCore::Context::IContextSimulator::followAircraft
virtual bool followAircraft(const BlackMisc::Aviation::CCallsign &callsign) override;
//! \copydoc BlackCore::Context::IContextSimulator::recalculateAllAircraft
virtual void recalculateAllAircraft() override;
//! \copydoc BlackCore::Context::IContextSimulator::resetToModelMatchingAircraft
virtual bool resetToModelMatchingAircraft(const BlackMisc::Aviation::CCallsign &callsign) override;
//! \copydoc BlackCore::Context::IContextSimulator::isWeatherActivated
virtual bool isWeatherActivated() const override;
//! \copydoc BlackCore::Context::IContextSimulator::setWeatherActivated
virtual void setWeatherActivated(bool activated) override;
//! \copydoc BlackCore::Context::IContextSimulator::requestWeatherGrid
virtual void requestWeatherGrid(const BlackMisc::Geo::CCoordinateGeodetic &position, const BlackMisc::CIdentifier &identifier) override;
//! \copydoc BlackCore::Context::IContextSimulator::requestElevationBySituation
virtual bool requestElevationBySituation(const BlackMisc::Aviation::CAircraftSituation &situation) override;
//! \copydoc BlackCore::Context::IContextSimulator::findClosestElevationWithinRange
virtual BlackMisc::Geo::CElevationPlane findClosestElevationWithinRange(const BlackMisc::Geo::CCoordinateGeodetic &reference, const BlackMisc::PhysicalQuantities::CLength &range) const override;
//! \copydoc BlackCore::Context::IContextSimulator::doMatchingsAgain
virtual int doMatchingsAgain() override;
//! \copydoc BlackCore::Context::IContextSimulator::doMatchingAgain
virtual bool doMatchingAgain(const BlackMisc::Aviation::CCallsign &callsign) override;
//! \copydoc BlackCore::Context::IContextSimulator::getMatchingMessages
virtual BlackMisc::CStatusMessageList getMatchingMessages(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc BlackCore::Context::IContextSimulator::isMatchingMessagesEnabled
virtual BlackMisc::Simulation::MatchingLog isMatchingMessagesEnabled() const override;
//! \copydoc BlackCore::Context::IContextSimulator::enableMatchingMessages
virtual void enableMatchingMessages(BlackMisc::Simulation::MatchingLog enabled) override;
//! \copydoc BlackCore::Context::IContextSimulator::getCurrentMatchingStatistics
virtual BlackMisc::Simulation::CMatchingStatistics getCurrentMatchingStatistics(bool missingOnly) const override;
//! \copydoc BlackCore::Context::IContextSimulator::setMatchingSetup
virtual void setMatchingSetup(const BlackMisc::Simulation::CAircraftMatcherSetup &setup) override;
//! \copydoc BlackCore::Context::IContextSimulator::getMatchingSetup
virtual BlackMisc::Simulation::CAircraftMatcherSetup getMatchingSetup() const override;
//! \copydoc BlackCore::Context::IContextSimulator::copyFsxTerrainProbe
virtual BlackMisc::CStatusMessageList copyFsxTerrainProbe(const BlackMisc::Simulation::CSimulatorInfo &simulator) override;
//! \copydoc BlackCore::Context::IContextSimulator::testRemoteAircraft
virtual bool testRemoteAircraft(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, bool add) override;
//! \copydoc BlackCore::Context::IContextSimulator::testUpdateRemoteAircraft
virtual bool testUpdateRemoteAircraft(const BlackMisc::Aviation::CCallsign &cs, const BlackMisc::Aviation::CAircraftSituation &situation, const BlackMisc::Aviation::CAircraftParts &parts) override;
// also in IAircraftModelSetProvider
//! \copydoc BlackCore::Context::IContextSimulator::getModelSet
virtual BlackMisc::Simulation::CAircraftModelList getModelSet() const override;
//! \copydoc BlackCore::Context::IContextSimulator::getModelSetCount
virtual int getModelSetCount() const override;
//! \addtogroup swiftdotcommands
//! \ingroup swiftdotcommands
//! <pre>
//! .plugin forwarded to plugin, see details there
//! .driver .drv forwarded to plugin (same as above)

114
src/blackcore/context/contextsimulatorproxy.h
View File

@@ -58,62 +58,176 @@ namespace BlackCore
public slots:
//! \name Interface overrides
//! @{
//! \copydoc BlackCore::Context::IContextSimulator::getSimulatorPluginInfo
virtual BlackMisc::Simulation::CSimulatorPluginInfo getSimulatorPluginInfo() const override;
//! \copydoc BlackCore::Context::IContextSimulator::getAvailableSimulatorPlugins
virtual BlackMisc::Simulation::CSimulatorPluginInfoList getAvailableSimulatorPlugins() const override;
//! \copydoc BlackCore::Context::IContextSimulator::getSimulatorSettings
virtual BlackMisc::Simulation::Settings::CSimulatorSettings getSimulatorSettings() const override;
//! \copydoc BlackCore::Context::IContextSimulator::setSimulatorSettings
virtual bool setSimulatorSettings(const BlackMisc::Simulation::Settings::CSimulatorSettings &settings, const BlackMisc::Simulation::CSimulatorInfo &simulatorInfo) override;
//! \copydoc BlackCore::Context::IContextSimulator::startSimulatorPlugin
virtual bool startSimulatorPlugin(const BlackMisc::Simulation::CSimulatorPluginInfo &simulatorInfo) override;
//! \copydoc BlackCore::Context::IContextSimulator::stopSimulatorPlugin
virtual void stopSimulatorPlugin(const BlackMisc::Simulation::CSimulatorPluginInfo &simulatorInfo) override;
//! \copydoc BlackCore::Context::IContextSimulator::checkListeners
virtual int checkListeners() override;
//! \copydoc BlackCore::Context::IContextSimulator::getSimulatorStatus
virtual int getSimulatorStatus() const override;
//! \copydoc BlackCore::Context::IContextSimulator::getAirportsInRange
virtual BlackMisc::Aviation::CAirportList getAirportsInRange(bool recalculatePosition) const override;
//! \copydoc BlackCore::Context::IContextSimulator::getModelSet
virtual BlackMisc::Simulation::CAircraftModelList getModelSet() const override;
//! \copydoc BlackCore::Context::IContextSimulator::simulatorsWithInitializedModelSet
virtual BlackMisc::Simulation::CSimulatorInfo simulatorsWithInitializedModelSet() const override;
//! \copydoc BlackCore::Context::IContextSimulator::verifyPrerequisites
virtual BlackMisc::CStatusMessageList verifyPrerequisites() const override;
//! \copydoc BlackCore::Context::IContextSimulator::getModelSetLoaderSimulator
virtual BlackMisc::Simulation::CSimulatorInfo getModelSetLoaderSimulator() const override;
//! \copydoc BlackCore::Context::IContextSimulator::setModelSetLoaderSimulator
virtual void setModelSetLoaderSimulator(const BlackMisc::Simulation::CSimulatorInfo &simulator) override;
//! \copydoc BlackCore::Context::IContextSimulator::getModelSetStrings
virtual QStringList getModelSetStrings() const override;
//! \copydoc BlackCore::Context::IContextSimulator::getModelSetCompleterStrings
virtual QStringList getModelSetCompleterStrings(bool sorted) const override;
//! \copydoc BlackCore::Context::IContextSimulator::removeModelsFromSet
virtual int removeModelsFromSet(const BlackMisc::Simulation::CAircraftModelList &removeModels) override;
//! \copydoc BlackCore::Context::IContextSimulator::isKnownModelInSet
virtual bool isKnownModelInSet(const QString &modelString) const override;
//! \copydoc BlackCore::Context::IContextSimulator::getModelSetModelsStartingWith
virtual BlackMisc::Simulation::CAircraftModelList getModelSetModelsStartingWith(const QString &modelString) const override;
//! \copydoc BlackCore::Context::IContextSimulator::getModelSetCount
virtual int getModelSetCount() const override;
//! \copydoc BlackCore::Context::IContextSimulator::getSimulatorInternals
virtual BlackMisc::Simulation::CSimulatorInternals getSimulatorInternals() const override;
//! \copydoc BlackCore::Context::IContextSimulator::disableModelsForMatching
virtual void disableModelsForMatching(const BlackMisc::Simulation::CAircraftModelList &removedModels, bool incremental) override;
//! \copydoc BlackCore::Context::IContextSimulator::getDisabledModelsForMatching
virtual BlackMisc::Simulation::CAircraftModelList getDisabledModelsForMatching() const override;
//! \copydoc BlackCore::Context::IContextSimulator::triggerModelSetValidation
virtual bool triggerModelSetValidation(const BlackMisc::Simulation::CSimulatorInfo &simulator) override;
//! \copydoc BlackCore::Context::IContextSimulator::isValidationInProgress
virtual bool isValidationInProgress() const override;
//! \copydoc BlackCore::Context::IContextSimulator::restoreDisabledModels
virtual void restoreDisabledModels() override;
//! \copydoc BlackCore::Context::IContextSimulator::setTimeSynchronization
virtual bool setTimeSynchronization(bool enable, const BlackMisc::PhysicalQuantities::CTime &offset) override;
//! \copydoc BlackCore::Context::IContextSimulator::isTimeSynchronized
virtual bool isTimeSynchronized() const override;
//! \copydoc BlackCore::Context::IContextSimulator::getInterpolationAndRenderingSetupGlobal
virtual BlackMisc::Simulation::CInterpolationAndRenderingSetupGlobal getInterpolationAndRenderingSetupGlobal() const override;
//! \copydoc BlackCore::Context::IContextSimulator::setInterpolationAndRenderingSetupGlobal
virtual void setInterpolationAndRenderingSetupGlobal(const BlackMisc::Simulation::CInterpolationAndRenderingSetupGlobal &setup) override;
//! \copydoc BlackCore::Context::IContextSimulator::getInterpolationAndRenderingSetupsPerCallsign
virtual BlackMisc::Simulation::CInterpolationSetupList getInterpolationAndRenderingSetupsPerCallsign() const override;
//! \copydoc BlackCore::Context::IContextSimulator::getInterpolationAndRenderingSetupPerCallsignOrDefault
virtual BlackMisc::Simulation::CInterpolationAndRenderingSetupPerCallsign getInterpolationAndRenderingSetupPerCallsignOrDefault(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc BlackCore::Context::IContextSimulator::setInterpolationAndRenderingSetupsPerCallsign
virtual bool setInterpolationAndRenderingSetupsPerCallsign(const BlackMisc::Simulation::CInterpolationSetupList &setups, bool ignoreSameAsGlobal) override;
//! \copydoc BlackCore::Context::IContextSimulator::getInterpolationMessages
virtual BlackMisc::CStatusMessageList getInterpolationMessages(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc BlackCore::Context::IContextSimulator::getTimeSynchronizationOffset
virtual BlackMisc::PhysicalQuantities::CTime getTimeSynchronizationOffset() const override;
//! \copydoc BlackCore::Context::IContextSimulator::iconForModel
virtual BlackMisc::CPixmap iconForModel(const QString &modelString) const override;
//! \copydoc BlackCore::Context::IContextSimulator::highlightAircraft
virtual void highlightAircraft(const BlackMisc::Simulation::CSimulatedAircraft &aircraftToHighlight, bool enableHighlight, const BlackMisc::PhysicalQuantities::CTime &displayTime) override;
//! \copydoc BlackCore::Context::IContextSimulator::followAircraft
virtual bool followAircraft(const BlackMisc::Aviation::CCallsign &callsign) override;
//! \copydoc BlackCore::Context::IContextSimulator::recalculateAllAircraft
virtual void recalculateAllAircraft() override;
//! \copydoc BlackCore::Context::IContextSimulator::resetToModelMatchingAircraft
virtual bool resetToModelMatchingAircraft(const BlackMisc::Aviation::CCallsign &callsign) override;
//! \copydoc BlackCore::Context::IContextSimulator::isWeatherActivated
virtual bool isWeatherActivated() const override;
//! \copydoc BlackCore::Context::IContextSimulator::setWeatherActivated
virtual void setWeatherActivated(bool activated) override;
//! \copydoc BlackCore::Context::IContextSimulator::requestWeatherGrid
virtual void requestWeatherGrid(const BlackMisc::Geo::CCoordinateGeodetic &position, const BlackMisc::CIdentifier &identifier) override;
//! \copydoc BlackCore::Context::IContextSimulator::requestElevationBySituation
virtual bool requestElevationBySituation(const BlackMisc::Aviation::CAircraftSituation &situation) override;
//! \copydoc BlackCore::Context::IContextSimulator::findClosestElevationWithinRange
virtual BlackMisc::Geo::CElevationPlane findClosestElevationWithinRange(const BlackMisc::Geo::CCoordinateGeodetic &reference, const BlackMisc::PhysicalQuantities::CLength &range) const override;
//! \copydoc BlackCore::Context::IContextSimulator::getMatchingMessages
virtual BlackMisc::CStatusMessageList getMatchingMessages(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc BlackCore::Context::IContextSimulator::isMatchingMessagesEnabled
virtual BlackMisc::Simulation::MatchingLog isMatchingMessagesEnabled() const override;
//! \copydoc BlackCore::Context::IContextSimulator::enableMatchingMessages
virtual void enableMatchingMessages(BlackMisc::Simulation::MatchingLog enabled) override;
//! \copydoc BlackCore::Context::IContextSimulator::parseCommandLine
virtual bool parseCommandLine(const QString &commandLine, const BlackMisc::CIdentifier &originator) override;
//! \copydoc BlackCore::Context::IContextSimulator::doMatchingsAgain
virtual int doMatchingsAgain() override;
//! \copydoc BlackCore::Context::IContextSimulator::doMatchingAgain
virtual bool doMatchingAgain(const BlackMisc::Aviation::CCallsign &callsign) override;
//! \copydoc BlackCore::Context::IContextSimulator::getCurrentMatchingStatistics
virtual BlackMisc::Simulation::CMatchingStatistics getCurrentMatchingStatistics(bool missingOnly) const override;
//! \copydoc BlackCore::Context::IContextSimulator::setMatchingSetup
virtual void setMatchingSetup(const BlackMisc::Simulation::CAircraftMatcherSetup &setup) override;
//! \copydoc BlackCore::Context::IContextSimulator::getMatchingSetup
virtual BlackMisc::Simulation::CAircraftMatcherSetup getMatchingSetup() const override;
//! \copydoc BlackCore::Context::IContextSimulator::copyFsxTerrainProbe
virtual BlackMisc::CStatusMessageList copyFsxTerrainProbe(const BlackMisc::Simulation::CSimulatorInfo &simulator) override;
//! \copydoc BlackCore::Context::IContextSimulator::testRemoteAircraft
virtual bool testRemoteAircraft(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, bool add) override;
//! \copydoc BlackCore::Context::IContextSimulator::testUpdateRemoteAircraft
virtual bool testUpdateRemoteAircraft(const BlackMisc::Aviation::CCallsign &cs, const BlackMisc::Aviation::CAircraftSituation &situation, const BlackMisc::Aviation::CAircraftParts &parts) override;
//! @}

12
src/blackcore/data/vatsimsetup.h
View File

@@ -117,26 +117,26 @@ namespace BlackCore::Data
//! Trait for global setup data
struct TVatsimSetup : public BlackMisc::TDataTrait<CVatsimSetup>
{
//! \copydoc BlackCore::TDataTrait::key
//! \copydoc BlackMisc::TDataTrait::key
static const char *key() { return "vatsimsetup"; }
//! \copydoc BlackCore::TDataTrait::isPinned
//! \copydoc BlackMisc::TDataTrait::isPinned
static constexpr bool isPinned() { return true; }
//! \copydoc BlackCore::TDataTrait::humanReadable
//! \copydoc BlackMisc::TDataTrait::humanReadable
static const QString &humanReadable() { static const QString name("VATSIM setup"); return name; }
};
//! Trait for last (most recently) used VATSIM server and user
struct TVatsimLastServer : public BlackMisc::TDataTrait<BlackMisc::Network::CServer>
{
//! \copydoc BlackCore::TDataTrait::isPinned
//! \copydoc BlackMisc::TDataTrait::isPinned
static const char *key() { return "vatsimserver"; }
//! \copydoc BlackCore::TDataTrait::isPinned
//! \copydoc BlackMisc::TDataTrait::isPinned
static constexpr bool isPinned() { return true; }
//! \copydoc BlackCore::TDataTrait::humanReadable
//! \copydoc BlackMisc::TDataTrait::humanReadable
static const QString &humanReadable() { static const QString name("Last VATSIM server"); return name; }
};
} // ns

8
src/blackcore/fsd/fsdclient.h
View File

@@ -256,9 +256,11 @@ namespace BlackCore::Fsd
private:
//! \cond
friend BlackFsdTest::CTestFSDClient;
//! \endcond
// Convenience functions for sendClientQuery
// really private, ONLY used by UNIT test, not CAirspaceMonitor
//! @{
//! Convenience functions for sendClientQuery
//! really private, ONLY used by UNIT test, not CAirspaceMonitor
void sendLogin(const QString &token = {});
void sendDeletePilot();
void sendDeleteAtc();
@@ -277,7 +279,7 @@ namespace BlackCore::Fsd
//
void sendMessageString(const QString &message);
void sendQueuedMessage();
//! \endcond
//! @}
//! @{
//! Increase the statistics value for given identifier

2
src/blackcore/simulator.h
View File

@@ -285,7 +285,7 @@ namespace BlackCore
//! Is this the emulated driver just pretending to be P3D, FSX, or XPlane
bool isEmulatedDriver() const;
//! \addtogroup swiftdotcommands
//! \ingroup swiftdotcommands
//! <pre>
//! .drv cg length clear|modelstring set overridden CG for model string BlackCore::ISimulator
//! .drv unload unload plugin BlackCore::ISimulator

14
src/blackgui/components/navigatordialog.h
View File

@@ -81,12 +81,26 @@ namespace BlackGui::Components
protected:
//! \name Base class events
//! @{
//! \copydoc QDialog::mouseMoveEvent
virtual void mouseMoveEvent(QMouseEvent *event) override;
//! \copydoc QDialog::mousePressEvent
virtual void mousePressEvent(QMouseEvent *event) override;
//! \copydoc QDialog::mouseReleaseEvent
virtual void mouseReleaseEvent(QMouseEvent *event) override;
//! \copydoc QDialog::changeEvent
virtual void changeEvent(QEvent *evt) override;
//! \copydoc CEnableForFramelessWindow::windowFlagsChanged
virtual void windowFlagsChanged() override;
//! \copydoc QDialog::paintEvent
virtual void paintEvent(QPaintEvent *event) override;
//! \copydoc QDialog::enterEvent
virtual void enterEvent(QEvent *event) override;
//! @}

1
src/blackgui/eventfilter.h
View File

@@ -21,6 +21,7 @@ namespace BlackGui
Q_OBJECT
public:
//! \copydoc QObject::QObject
using QObject::QObject;
//! Not allowed characters

24
src/blackgui/models/listmodelbase.h
View File

@@ -46,19 +46,39 @@ namespace BlackGui::Models
//! \name Functions from QStandardItemModel
//! @{
//! \copydoc QStandardItemModel::data
virtual QVariant data(const QModelIndex &index, int role) const override;
//! \copydoc QStandardItemModel::setData
virtual bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) final override;
//! \copydoc QStandardItemModel::mimeData
virtual QMimeData *mimeData(const QModelIndexList &indexes) const final override;
//! \copydoc QStandardItemModel::sort
virtual void sort(int column, Qt::SortOrder order) final override;
//! \copydoc QStandardItemModel::rowCount
virtual int rowCount(const QModelIndex &parentIndex = QModelIndex()) const final override;
//! \copydoc QStandardItemModel::canDropMimeData
virtual bool canDropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) const final override;
//! \copydoc QStandardItemModel::dropMimeData
virtual bool dropMimeData(const QMimeData *mimeData, Qt::DropAction action, int row, int column, const QModelIndex &parent) final override;
//! @}
//! \name Functions from CListModelBaseNonTemplate
//! @{
//! \copydoc BlackGui::Models::CListModelBaseNonTemplate::toJson
virtual QJsonObject toJson(bool selectedOnly = false) const override;
//! \copydoc BlackGui::Models::CListModelBaseNonTemplate::toJsonString
virtual QString toJsonString(QJsonDocument::JsonFormat format = QJsonDocument::Indented, bool selectedOnly = false) const override;
//! \copydoc BlackGui::Models::CListModelBaseNonTemplate::isOrderable
virtual bool isOrderable() const override;
//! @}
@@ -169,7 +189,11 @@ namespace BlackGui::Models
//! \name Base class overrides
//! @{
//! \copydoc BlackGui::Models::CListModelBaseNonTemplate::onDataChanged
virtual void onDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomLeft, const QVector<int> &roles) override;
//! \copydoc BlackGui::Models::CListModelBaseNonTemplate::onDataChanged
virtual void onChangedDigest() override;
//! @}

15
src/blackgui/models/listmodelbasenontemplate.h
View File

@@ -50,13 +50,28 @@ namespace BlackGui::Models
//! \name Functions from QStandardItemModel
//! @{
//! \copydoc QStandardItemModel::columnCount
virtual int columnCount(const QModelIndex &modelIndex = QModelIndex()) const final override;
//! \copydoc QStandardItemModel::headerData
virtual QVariant headerData(int section, Qt::Orientation orientation, int role) const final override;
//! \copydoc QStandardItemModel::index
virtual QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const final override;
//! \copydoc QStandardItemModel::parent
virtual QModelIndex parent(const QModelIndex &child) const final override;
//! \copydoc QStandardItemModel::flags
virtual Qt::ItemFlags flags(const QModelIndex &index) const final override;
//! \copydoc QStandardItemModel::supportedDragActions
virtual Qt::DropActions supportedDragActions() const final override;
//! \copydoc QStandardItemModel::supportedDropActions
virtual Qt::DropActions supportedDropActions() const final override;
//! \copydoc QStandardItemModel::mimeTypes
virtual QStringList mimeTypes() const final override;
//! @}

4
src/blackgui/models/listmodeldbobjects.h
View File

@@ -101,7 +101,11 @@ namespace BlackGui::Models
//! \name specialized BlackGui::Models::CListModelDbObjects functions for ordering
//! @{
using COrderableListModelDbObjects::CListModelDbObjects::update;
//! \copydoc BlackGui::Models::CListModelDbObjects::update
virtual int update(const ContainerType &container, bool sort) override;
//! \copydoc BlackGui::Models::CListModelDbObjects::moveItems
virtual void moveItems(const ContainerType &items, int position) override;
//! @}

8
src/blackgui/views/aircraftmodelview.h
View File

@@ -139,9 +139,17 @@ namespace BlackGui
//! \name View base class overrides
//! @{
//! \copydoc BlackGui::Views::COrderableViewWithDbObjects::customMenu
virtual void customMenu(Menus::CMenuActions &menuActions) override;
//! \copydoc BlackGui::Views::COrderableViewWithDbObjects::modifyLoadedJsonData
virtual BlackMisc::CStatusMessage modifyLoadedJsonData(BlackMisc::Simulation::CAircraftModelList &models) const override;
//! \copydoc BlackGui::Views::COrderableViewWithDbObjects::validateLoadedJsonData
virtual BlackMisc::CStatusMessage validateLoadedJsonData(const BlackMisc::Simulation::CAircraftModelList &models) const override;
//! \copydoc BlackGui::Views::COrderableViewWithDbObjects::jsonLoadedAndModelUpdated
virtual void jsonLoadedAndModelUpdated(const BlackMisc::Simulation::CAircraftModelList &models) override;
//! @}

93
src/blackgui/views/viewbase.h
View File

@@ -433,10 +433,19 @@ namespace BlackGui
//! \name Functions from QTableView
//! @{
//! \copydoc QTableView::resizeEvent
virtual void resizeEvent(QResizeEvent *event) override;
//! \copydoc QTableView::dragEnterEvent
virtual void dragEnterEvent(QDragEnterEvent *event) override;
//! \copydoc QTableView::dragMoveEvent
virtual void dragMoveEvent(QDragMoveEvent *event) override;
//! \copydoc QTableView::dragLeaveEvent
virtual void dragLeaveEvent(QDragLeaveEvent *event) override;
//! \copydoc QTableView::dropEvent
virtual void dropEvent(QDropEvent *event) override;
//! @}
@@ -686,8 +695,14 @@ namespace BlackGui
//! \name Selection model interface ISelectionModel
//! @{
//! \copydoc BlackGui::Models::ISelectionModel::selectObjects
virtual void selectObjects(const ContainerType &selectedObjects) override;
//! \copydoc BlackGui::Models::ISelectionModel::selectedObjects
virtual ContainerType selectedObjects() const override;
//! \copydoc BlackGui::Models::ISelectionModel::unselectedObjects
virtual ContainerType unselectedObjects() const override;
//! @}
@@ -726,29 +741,69 @@ namespace BlackGui
//! \name Slot overrides from base class
//! @{
//!\copydoc BlackGui::Views::CViewBaseNonTemplate::removeSelectedRows
virtual int removeSelectedRows() override;
//!\copydoc BlackGui::Views::CViewBaseNonTemplate::presizeOrFullResizeToContents
virtual void presizeOrFullResizeToContents() override;
//!\copydoc BlackGui::Views::CViewBaseNonTemplate::clearHighlighting
virtual void clearHighlighting() override;
//!\copydoc BlackGui::Views::CViewBaseNonTemplate::materializeFilter
virtual void materializeFilter() override;
//! @}
//! \name BlackGui::Views::CViewBaseNonTemplate implementations
//! @{
//!\copydoc BlackGui::Views::CViewBaseNonTemplate::clear
virtual void clear() override;
//!\copydoc BlackGui::Views::CViewBaseNonTemplate::rowCount
virtual int rowCount() const override;
//!\copydoc BlackGui::Views::CViewBaseNonTemplate::isEmpty
virtual bool isEmpty() const override;
//!\copydoc BlackGui::Views::CViewBaseNonTemplate::isOrderable
virtual bool isOrderable() const override;
//!\copydoc BlackGui::Views::CViewBaseNonTemplate::allowDragDrop
virtual void allowDragDrop(bool allowDrag, bool allowDrop, bool allowDropJsonFile = false) override;
//!\copydoc BlackGui::Views::CViewBaseNonTemplate::isDropAllowed
virtual bool isDropAllowed() const override;
//!\copydoc BlackGui::Views::CViewBaseNonTemplate::dropEvent
virtual void dropEvent(QDropEvent *event) override;
//!\copydoc BlackGui::Views::CViewBaseNonTemplate::acceptDrop
virtual bool acceptDrop(const QMimeData *mimeData) const override;
//!\copydoc BlackGui::Views::CViewBaseNonTemplate::setSorting
virtual bool setSorting(const BlackMisc::CPropertyIndex &propertyIndex, Qt::SortOrder order = Qt::AscendingOrder) override;
//!\copydoc BlackGui::Views::CViewBaseNonTemplate::sortByPropertyIndex
virtual void sortByPropertyIndex(const BlackMisc::CPropertyIndex &propertyIndex, Qt::SortOrder order = Qt::AscendingOrder) override;
//!\copydoc BlackGui::Views::CViewBaseNonTemplate::setNoSorting
virtual void setNoSorting() override { m_model->setNoSorting(); }
//!\copydoc BlackGui::Views::CViewBaseNonTemplate::getSortProperty
virtual BlackMisc::CPropertyIndex getSortProperty() const override { return m_model->getSortProperty(); }
//!\copydoc BlackGui::Views::CViewBaseNonTemplate::getSortColumn
virtual int getSortColumn() const override { return m_model->getSortColumn(); }
//!\copydoc BlackGui::Views::CViewBaseNonTemplate::hasValidSortColumn
virtual bool hasValidSortColumn() const override { return m_model->hasValidSortColumn(); }
//!\copydoc BlackGui::Views::CViewBaseNonTemplate::endsWithEmptyColumn
virtual bool endsWithEmptyColumn() const override { return m_model->endsWithEmptyColumn(); }
//!\copydoc BlackGui::Views::CViewBaseNonTemplate::getSortOrder
virtual Qt::SortOrder getSortOrder() const override { return m_model->getSortOrder(); }
//! @}
@@ -806,19 +861,47 @@ namespace BlackGui
//! \name base class implementations
//! @{
//!\copydoc BlackGui::Views::CViewBaseNonTemplate::reachedResizeThreshold
virtual bool reachedResizeThreshold(int containrerSize = -1) const override;
//!\copydoc BlackGui::Views::CViewBaseNonTemplate::performModeBasedResizeToContent
virtual void performModeBasedResizeToContent() override;
//!\copydoc BlackGui::Views::CViewBaseNonTemplate::performUpdateContainer
virtual int performUpdateContainer(const BlackMisc::CVariant &variant, bool sort, bool resize) override;
//!\copydoc BlackGui::Views::CViewBaseNonTemplate::updateSortIndicator
virtual void updateSortIndicator() override;
//!\copydoc BlackGui::Views::CViewBaseNonTemplate::mouseOverCallback
virtual void mouseOverCallback(const QModelIndex &index, bool mouseOver) override;
//!\copydoc BlackGui::Views::CViewBaseNonTemplate::drawDropIndicator
virtual void drawDropIndicator(bool indicator) override;
//!\copydoc BlackGui::Views::CViewBaseNonTemplate::copy
virtual void copy() override;
//!\copydoc BlackGui::Views::CViewBaseNonTemplate::cut
virtual void cut() override;
//!\copydoc BlackGui::Views::CViewBaseNonTemplate::paste
virtual void paste() override;
//!\copydoc BlackGui::Views::CViewBaseNonTemplate::displayJsonPopup
virtual void displayJsonPopup() override { this->displayContainerAsJsonPopup(false); }
//!\copydoc BlackGui::Views::CViewBaseNonTemplate::displaySelectedJsonPopup
virtual void displaySelectedJsonPopup() override { this->displayContainerAsJsonPopup(true); }
//!\copydoc BlackGui::Views::CViewBaseNonTemplate::filterDialogFinished
virtual bool filterDialogFinished(int status) override;
//!\copydoc BlackGui::Views::CViewBaseNonTemplate::filterWidgetChangedFilter
virtual bool filterWidgetChangedFilter(bool enabled) override;
//!\copydoc BlackGui::Views::CViewBaseNonTemplate::removeFilter
virtual void removeFilter() override;
//! @}
@@ -843,10 +926,20 @@ namespace BlackGui
//! \name Overrides from base class
//! @{
//!\copydoc BlackGui::Views::CViewBaseNonTemplate::removeFilter
virtual void onClicked(const QModelIndex &index) override;
//!\copydoc BlackGui::Views::CViewBaseNonTemplate::onDoubleClicked
virtual void onDoubleClicked(const QModelIndex &index) override;
//!\copydoc BlackGui::Views::CViewBaseNonTemplate::onRowSelected
virtual void onRowSelected(const QModelIndex &index) override;
//!\copydoc BlackGui::Views::CViewBaseNonTemplate::loadJson
virtual BlackMisc::CStatusMessage loadJson(const QString &directory = {}) override;
//!\copydoc BlackGui::Views::CViewBaseNonTemplate::saveJson
virtual BlackMisc::CStatusMessage saveJson(bool selectedOnly = false, const QString &directory = {}) override;
//! @}
};

4
src/blackgui/views/viewbaseitemdelegate.h
View File

@@ -30,7 +30,11 @@ namespace BlackGui::Views
//! \name QStyledItemDelegate overrides
//! @{
//! \copydoc QStyledItemDelegate::paint
virtual void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
//! \copydoc QStyledItemDelegate::sizeHint
virtual QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override;
//! @}

2
src/blackgui/views/viewbaseproxystyle.h
View File

@@ -33,6 +33,8 @@ namespace BlackGui::Views
//! \name Proxy style overrides
//! @{
//! \copydoc QProxyStyle::drawPrimitive
virtual void drawPrimitive(PrimitiveElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget) const override;
//! @}

2
src/blackgui/views/viewdbobjects.h
View File

@@ -128,6 +128,4 @@ namespace BlackGui
} // namespace
} // namespace
//! \endcond
#endif // guard

20
src/blackmisc/collection.h
View File

@@ -99,19 +99,35 @@ namespace BlackMisc
public Mixin::Icon<CCollection<T>>
{
public:
//! @{
//! STL compatibility
typedef T key_type;
//! STL compatibility
typedef T value_type;
//! STL compatibility
typedef T &reference;
//! STL compatibility
typedef const T &const_reference;
//! STL compatibility
typedef T *pointer;
//! STL compatibility
typedef const T *const_pointer;
//! STL compatibility
typedef typename QOrderedSet<T>::const_iterator const_iterator;
//! STL compatibility
typedef const_iterator iterator; // can't modify elements in-place
//! STL compatibility
typedef ptrdiff_t difference_type;
//! STL compatibility
typedef int size_type;
//! @}
//! Default constructor.
CCollection() {}

33
src/blackmisc/dictionary.h
View File

@@ -98,17 +98,26 @@ namespace BlackMisc
//! The implementation container
using impl_type = Impl<Key, Value>;
//! @{
//! STL compatibility
typedef Key key_type;
//! STL compatibility
typedef Value value_type;
//! STL compatibility
typedef Value &reference;
//! STL compatibility
typedef const Value &const_reference;
//! STL compatibility
typedef typename Impl<Key, Value>::size_type size_type;
//! STL compatibility
typedef typename Impl<Key, Value>::iterator iterator;
//! STL compatibility
typedef typename Impl<Key, Value>::const_iterator const_iterator;
//! @}
//! Return a copy containing only those elements for which the dictionary keys return true for a given predicate.
template <class Predicate>
@@ -304,25 +313,29 @@ namespace BlackMisc
//! Returns const iterator at the end of the dictionary
const_iterator cend() const { return m_impl.cend(); }
//! @{
//! Returns const iterator for iterating over keys
auto keyBegin() const { return m_impl.keyBegin(); }
auto keyEnd() const { return m_impl.keyEnd(); }
//! @}
//! @{
//! Returns const iterator for iterating over keys
auto keyEnd() const { return m_impl.keyEnd(); }
//! Returns iterator for iterating over keys and values together
auto keyValueBegin() { return m_impl.keyValueBegin(); }
auto keyValueEnd() { return m_impl.keyValueEnd(); }
//! @}
//! @{
//! Returns iterator for iterating over keys and values together
auto keyValueEnd() { return m_impl.keyValueEnd(); }
//! Returns const iterator for iterating over keys and values together
auto keyValueBegin() const { return m_impl.keyValueBegin(); }
//! Returns const iterator for iterating over keys and values together
auto constKeyValueBegin() const { return m_impl.constKeyValueBegin(); }
//! Returns const iterator for iterating over keys and values together
auto keyValueEnd() const { return m_impl.keyValueEnd(); }
//! Returns const iterator for iterating over keys and values together
auto constKeyValueEnd() const { return m_impl.constKeyValueEnd(); }
//! @}
//! Removes all items from the dictionary
void clear() { m_impl.clear(); }

2
src/blackmisc/json.h
View File

@@ -36,9 +36,9 @@ class QStringList;
* \defgroup JSON Streaming operators for JSON
*/
//! \ingroup JSON
//! @{
//! Streaming operators for QJsonValue (to value)
//! \ingroup JSON
BLACKMISC_EXPORT const QJsonValue &operator >>(const QJsonValue &json, int &value);
BLACKMISC_EXPORT const QJsonValue &operator >>(const QJsonValue &json, qlonglong &value);
BLACKMISC_EXPORT const QJsonValue &operator >>(const QJsonValue &json, qulonglong &value);

4
src/blackmisc/metaclass.h
View File

@@ -93,11 +93,11 @@
)
// *INDENT-ON*
//! @{
//! std::string qHash
inline uint qHash(const std::string &key, uint seed) { return qHash(QString::fromStdString(key), seed); }
//! std::string qHash
inline uint qHash(const std::string &key) { return qHash(QString::fromStdString(key)); }
//! @}
namespace BlackMisc
{

10
src/blackmisc/pq/physicalquantity.h
View File

@@ -158,17 +158,17 @@ namespace BlackMisc::PhysicalQuantities
//! Set value in current unit
void setCurrentUnitValue(double value);
//! @{
//! As integer value
int valueInteger(MU unit) const;
QString valueIntegerAsString(MU unit) const { return QString::number(this->valueInteger(unit)); }
//! @}
//! @{
//! As integer value
QString valueIntegerAsString(MU unit) const { return QString::number(this->valueInteger(unit)); }
//! As integer value in current unit
int valueInteger() const;
//! As integer value in current unit
QString valueIntegerAsString() const { return QString::number(this->valueInteger()); }
//! @}
//! Is value an integer
bool isInteger() const;

32
src/blackmisc/sequence.h
View File

@@ -85,21 +85,41 @@ namespace BlackMisc
public Mixin::Icon<CSequence<T>>
{
public:
//! @{
//! STL compatibility
typedef T key_type;
//! STL compatilibty
typedef T value_type;
//! STL compatibility
typedef T &reference;
//! STL compatibility
typedef const T &const_reference;
//! STL compatibility
typedef T *pointer;
//! STL compatibility
typedef const T *const_pointer;
//! STL compatibility
typedef typename QVector<T>::const_iterator const_iterator;
//! STL compatibility
typedef typename QVector<T>::iterator iterator;
//! STL compatibility
typedef typename QVector<T>::const_reverse_iterator const_reverse_iterator;
//! STL compatibility
typedef typename QVector<T>::reverse_iterator reverse_iterator;
//! STL compatibility
typedef ptrdiff_t difference_type;
//! STL compatibility
typedef int size_type;
//! @}
//! Default constructor.
CSequence() = default;
@@ -107,11 +127,11 @@ namespace BlackMisc
//! Initializer list constructor.
CSequence(std::initializer_list<T> il) : m_impl(il) {}
//! @{
//! By QVector of type T.
CSequence(const QVector<T> &vector) : m_impl(vector) {}
//! By QVector of type T.
CSequence(QVector<T> &&vector) : m_impl(std::move(vector)) {}
//! @}
//! By QList of type T.
CSequence(const QList<T> &list) : m_impl(list.toVector()) {}
@@ -135,11 +155,11 @@ namespace BlackMisc
//! Destructor.
~CSequence() = default;
//! @{
//! Copy of internal vector.
QVector<T> toVector() const & { return m_impl; }
//! Copy of internal vector.
QVector<T> toVector() && { return std::move(m_impl); }
//! @}
//! Returns iterator at the beginning of the sequence.
iterator begin() { return m_impl.begin(); }

12
src/blackmisc/sharedstate/dbus/dupleximpl.h
View File

@@ -41,11 +41,23 @@ namespace BlackMisc
public slots:
//! \name Interface implementations
//! @{
//! \copydoc BlackMisc::SharedState::DBus::IDuplex::postEvent
virtual void postEvent(const QString &channel, const BlackMisc::CVariant &param) override;
//! \copydoc BlackMisc::SharedState::DBus::IDuplex::setSubscription
virtual void setSubscription(const QString &channel, const BlackMisc::CVariantList &filters) override;
//! \copydoc BlackMisc::SharedState::DBus::IDuplex::requestPeerSubscriptions
virtual void requestPeerSubscriptions() override;
//! \copydoc BlackMisc::SharedState::DBus::IDuplex::submitRequest
virtual void submitRequest(const QString &channel, const BlackMisc::CVariant &param, quint32 token) override;
//! \copydoc BlackMisc::SharedState::DBus::IDuplex::advertise
virtual void advertise(const QString &channel) override;
//! \copydoc BlackMisc::SharedState::DBus::IDuplex::withdraw
virtual void withdraw(const QString &channel) override;
//! @}

14
src/blackmisc/sharedstate/dbus/duplexproxy.h
View File

@@ -34,12 +34,26 @@ namespace BlackMisc
public slots:
//! \name Interface implementations
//! @{
//! \copydoc BlackMisc::SharedState::DBus::IDuplex::postEvent
virtual void postEvent(const QString &channel, const BlackMisc::CVariant &param) override;
//! \copydoc BlackMisc::SharedState::DBus::IDuplex::setSubscription
virtual void setSubscription(const QString &channel, const BlackMisc::CVariantList &filters) override;
//! \copydoc BlackMisc::SharedState::DBus::IDuplex::requestPeerSubscriptions
virtual void requestPeerSubscriptions() override;
//! \copydoc BlackMisc::SharedState::DBus::IDuplex::submitRequest
virtual void submitRequest(const QString &channel, const BlackMisc::CVariant &param, quint32 token) override;
//! \copydoc BlackMisc::SharedState::DBus::IDuplex::reply
virtual void reply(const BlackMisc::CVariant &param, quint32 token) override;
//! \copydoc BlackMisc::SharedState::DBus::IDuplex::advertise
virtual void advertise(const QString &channel) override;
//! \copydoc BlackMisc::SharedState::DBus::IDuplex::withdraw
virtual void withdraw(const QString &channel) override;
//! @}

4
src/blackmisc/sharedstate/dbus/hubimpl.h
View File

@@ -51,7 +51,11 @@ namespace BlackMisc
public slots:
//! \name Interface implementations
//! @{
//! \copydoc BlackMisc::SharedState::DBus::IHub::openDuplex
virtual bool openDuplex(const BlackMisc::CIdentifier &client) override;
//! \copydoc BlackMisc::SharedState::DBus::IHub::closeDuplex
virtual void closeDuplex(const BlackMisc::CIdentifier &client) override;
//! @}

4
src/blackmisc/sharedstate/dbus/hubproxy.h
View File

@@ -44,7 +44,11 @@ namespace BlackMisc
public slots:
//! \name Interface implementations
//! @{
//! \copydoc BlackMisc::SharedState::DBus::IHub::openDuplex
virtual bool openDuplex(const BlackMisc::CIdentifier &client) override;
//! \copydoc BlackMisc::SharedState::DBus::IHub::closeDuplex
virtual void closeDuplex(const BlackMisc::CIdentifier &client) override;
//! @}

18
src/blackmisc/simulation/data/modelcaches.h
View File

@@ -393,14 +393,32 @@ namespace BlackMisc::Simulation::Data
public:
//! \name Interface implementations
//! @{
//! \copydoc BlackMisc::Simulation::Data::IMultiSimulatorModelCaches::getCachedModels
virtual CAircraftModelList getCachedModels(const CSimulatorInfo &simulator) const override { return instanceCaches().getCachedModels(simulator); }
//! \copydoc BlackMisc::Simulation::Data::IMultiSimulatorModelCaches::setCachedModels
virtual CStatusMessage setCachedModels(const CAircraftModelList &models, const CSimulatorInfo &simulator) override { return instanceCaches().setCachedModels(models, simulator); }
//! \copydoc BlackMisc::Simulation::Data::IMultiSimulatorModelCaches::getCacheTimestamp
virtual QDateTime getCacheTimestamp(const CSimulatorInfo &simulator) const override { return instanceCaches().getCacheTimestamp(simulator); }
//! \copydoc BlackMisc::Simulation::Data::IMultiSimulatorModelCaches::setCacheTimestamp
virtual CStatusMessage setCacheTimestamp(const QDateTime &ts, const CSimulatorInfo &simulator) override { return instanceCaches().setCacheTimestamp(ts, simulator); }
//! \copydoc BlackMisc::Simulation::Data::IMultiSimulatorModelCaches::synchronizeCache
virtual void synchronizeCache(const CSimulatorInfo &simulator) override { return instanceCaches().synchronizeCache(simulator); }
//! \copydoc BlackMisc::Simulation::Data::IMultiSimulatorModelCaches::admitCache
virtual void admitCache(const CSimulatorInfo &simulator) override { return instanceCaches().admitCache(simulator); }
//! \copydoc BlackMisc::Simulation::Data::IMultiSimulatorModelCaches::getFilename
virtual QString getFilename(const CSimulatorInfo &simulator) const override { return instanceCaches().getFilename(simulator); }
//! \copydoc BlackMisc::Simulation::Data::IMultiSimulatorModelCaches::isSaved
virtual bool isSaved(const CSimulatorInfo &simulator) const override { return instanceCaches().isSaved(simulator); }
//! \copydoc BlackMisc::Simulation::Data::IMultiSimulatorModelCaches::getDescription
virtual QString getDescription() const override { return instanceCaches().getDescription(); }
//! @}

14
src/blackmisc/simulation/interpolatorspline.h
View File

@@ -42,8 +42,20 @@ namespace BlackMisc::Simulation
//! Zero initialized position array
static const PosArray &zeroPosArray();
//! @{
//! 3 coordinates for spline interpolation
std::array<double, 3> x, y, z, a, gnd, t, dx, dy, dz, da, dgnd;
std::array<double, 3> x;
std::array<double, 3> y;
std::array<double, 3> z;
std::array<double, 3> a;
std::array<double, 3> gnd;
std::array<double, 3> t;
std::array<double, 3> dx;
std::array<double, 3> dy;
std::array<double, 3> dz;
std::array<double, 3> da;
std::array<double, 3> dgnd;
//! @}
//! Array size
int size() const { return static_cast<int>(x.size()); }

68
src/blackmisc/statusmessage.h
View File

@@ -152,71 +152,71 @@ namespace BlackMisc
//! Construct a message with some specific categories.
CMessageBase(const CLogCategoryList &categories, const CLogCategoryList &extra) : CMessageBase(categories) { this->addIfNotExisting(extra); }
//! @{
//! Set the severity and format string.
template <size_t N>
Derived &log(StatusSeverity s, const char16_t (&m)[N]) { m_message = m; m_severity = s; return derived(); }
//! Set the severity and format string.
Derived &log(StatusSeverity s, const QString &m) { m_message = m; m_severity = s; return derived(); }
//! @}
//! Set the severity to debug.
Derived &debug() { return log(SeverityDebug, QString()); }
//! @{
//! Set the severity to debug, providing a format string.
template <size_t N>
Derived &debug(const char16_t (&format)[N]) { return log(SeverityDebug, format); }
Derived &debug(const QString &format) { return log(SeverityDebug, format); }
//! @}
//! @{
//! Set the severity to debug, providing a format string.
Derived &debug(const QString &format) { return log(SeverityDebug, format); }
//! Set the severity to info, providing a format string.
template <size_t N>
Derived &info(const char16_t (&format)[N]) { return log(SeverityInfo, format); }
Derived &info(const QString &format) { return log(SeverityInfo, format); }
//! @}
//! @{
//! Set the severity to info, providing a format string.
Derived &info(const QString &format) { return log(SeverityInfo, format); }
//! Set the severity to warning, providing a format string.
template <size_t N>
Derived &warning(const char16_t (&format)[N]) { return log(SeverityWarning, format); }
Derived &warning(const QString &format) { return log(SeverityWarning, format); }
//! @}
//! @{
//! Set the severity to warning, providing a format string.
Derived &warning(const QString &format) { return log(SeverityWarning, format); }
//! Set the severity to error, providing a format string.
template <size_t N>
Derived &error(const char16_t (&format)[N]) { return log(SeverityError, format); }
Derived &error(const QString &format) { return log(SeverityError, format); }
//! @}
//! @{
//! Set the severity to error, providing a format string.
Derived &error(const QString &format) { return log(SeverityError, format); }
//! Set the severity to s, providing a format string, and adding the validation category.
template <size_t N>
Derived &validation(StatusSeverity s, const char16_t (&format)[N]) { setValidation(); return log(s, format); }
Derived &validation(StatusSeverity s, const QString &format) { setValidation(); return log(s, format); }
//! @}
//! @{
//! Set the severity to s, providing a format string, and adding the validation category.
Derived &validation(StatusSeverity s, const QString &format) { setValidation(); return log(s, format); }
//! Set the severity to info, providing a format string, and adding the validation category.
template <size_t N>
Derived &validationInfo(const char16_t (&format)[N]) { setValidation(); return log(SeverityInfo, format); }
Derived &validationInfo(const QString &format) { setValidation(); return log(SeverityInfo, format); }
//! @}
//! @{
//! Set the severity to info, providing a format string, and adding the validation category.
Derived &validationInfo(const QString &format) { setValidation(); return log(SeverityInfo, format); }
//! Set the severity to warning, providing a format string, and adding the validation category.
template <size_t N>
Derived &validationWarning(const char16_t (&format)[N]) { setValidation(); return log(SeverityWarning, format); }
Derived &validationWarning(const QString &format) { setValidation(); return log(SeverityWarning, format); }
//! @}
//! @{
//! Set the severity to warning, providing a format string, and adding the validation category.
Derived &validationWarning(const QString &format) { setValidation(); return log(SeverityWarning, format); }
//! Set the severity to error, providing a format string, and adding the validation category.
template <size_t N>
Derived &validationError(const char16_t (&format)[N]) { setValidation(); return log(SeverityError, format); }
//! Set the severity to error, providing a format string, and adding the validation category.
Derived &validationError(const QString &format) { setValidation(); return log(SeverityError, format); }
//! @}
//! @{
//! Deleted methods to avoid accidental implicit conversion from Latin-1 or UTF-8 string literals.
@@ -231,16 +231,19 @@ namespace BlackMisc
Derived &validationError(const char *) = delete;
//! @}
//! @{
//! Streaming operators.
//! \details If the format string is empty, the message will consist of all streamed values separated by spaces.
//! Otherwise, the streamed values will replace the place markers %1, %2, %3... in the format string.
//! \see QString::arg
template <class T, std::enable_if_t<TParameter<std::decay_t<T>>::passBy == ParameterPassBy::Value, int> = 0>
Derived &operator <<(T v) { return arg(TString<T>::toQString(v)); }
//! Streaming operators.
//! \details If the format string is empty, the message will consist of all streamed values separated by spaces.
//! Otherwise, the streamed values will replace the place markers %1, %2, %3... in the format string.
//! \see QString::arg
template <class T, std::enable_if_t<TParameter<std::decay_t<T>>::passBy == ParameterPassBy::ConstRef, int> = 0>
Derived &operator <<(const T &v) { return arg(TString<T>::toQString(v)); }
//! @}
//! Message empty
bool isEmpty() const { return this->m_message.isEmpty() && this->m_args.isEmpty(); }
@@ -275,15 +278,20 @@ namespace BlackMisc
}
protected:
//! @{
//! \private
//! Private
CStrongStringView m_message;
//! Private
QStringList m_args;
//! Private
CLogCategoryList m_categories = CLogCategoryList { CLogCategories::uncategorized() };
//! Private
StatusSeverity m_severity = SeverityDebug;
//! Private
QString message() const { return Private::arg(m_message.view(), m_args); }
//! @}
};
/*!

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

@@ -81,7 +81,7 @@ namespace BlackSimPlugin::Emulated
virtual int physicallyRemoveMultipleRemoteAircraft(const BlackMisc::Aviation::CCallsignSet &callsigns) override;
// functions logged and used
//! \addtogroup swiftdotcommands
//! \ingroup swiftdotcommands
//! <pre>
//! .drv show show emulated driver window BlackSimPlugin::Swift::CSimulatorEmulated
//! .drv hide hide emulated driver window BlackSimPlugin::Swift::CSimulatorEmulated

2
src/plugins/simulator/fscommon/simulatorfscommon.h
View File

@@ -63,7 +63,7 @@ namespace BlackSimPlugin::FsCommon
//! When swift DB data are read
virtual void onSwiftDbAirportsRead() override;
//! \addtogroup swiftdotcommands
//! \ingroup swiftdotcommands
//! <pre>
//! .drv fsuipc on|off FSUIPC on/off
//! </pre>

2
src/plugins/simulator/fsxcommon/simulatorfsxcommon.h
View File

@@ -244,7 +244,7 @@ namespace BlackSimPlugin::FsxCommon
//! Specific P3D events
virtual HRESULT initEventsP3D();
//! \addtogroup swiftdotcommands
//! \ingroup swiftdotcommands
//! <pre>
//! .drv sendid on|off tracing simConnect sendId on/off
//! </pre>

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

@@ -44,7 +44,7 @@ namespace BlackSimPlugin::Common
BlackMisc::Network::IClientProvider *clientProvider,
QObject *parent = nullptr);
//! \addtogroup swiftdotcommands
//! \ingroup swiftdotcommands
//! <pre>
//! .drv intdisplay interpolation log display
//! </pre>

2
src/swiftdata/swiftdata.h
View File

@@ -48,6 +48,8 @@ public:
protected:
//! \name QMainWindow events
//! @{
//! \copydoc QMainWindow::closeEvent
virtual void closeEvent(QCloseEvent *event) override;
//! @}

10
src/swiftguistandard/swiftguistd.h
View File

@@ -94,10 +94,20 @@ signals:
protected:
//! \name QMainWindow events
//! @{
//! \copydoc QMainWindow::mouseMoveEvent
virtual void mouseMoveEvent(QMouseEvent *event) override;
//! \copydoc QMainWindow::mousePressEvent
virtual void mousePressEvent(QMouseEvent *event) override;
//! \copydoc QMainWindow::mouseReleaseEvent
virtual void mouseReleaseEvent(QMouseEvent *event) override;
//! \copydoc QMainWindow::closeEvent
virtual void closeEvent(QCloseEvent *event) override;
//! \copydoc QMainWindow::changeEvent
virtual void changeEvent(QEvent *event) override;
//! @}

4
tests/blackmisc/testsharedstate/testsharedstate.h
View File

@@ -108,7 +108,11 @@ namespace BlackMiscTest
//! \name Interface implementation
//! @{
//! \copydoc BlackMisc::SharedState::CListObserver::onElementAdded
virtual void onElementAdded(const int &) override {}
//! \copydoc BlackMisc::SharedState::CListObserver::onElementsReplaced
virtual void onElementsReplaced(const QList<int> &) override {}
//! @}
};