flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-13 15:45:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

[doxygen] Fix broken groupings

Browse Source
This commit is contained in:
Mat Sutcliffe
2020-08-01 19:08:08 +01:00
parent faf7f2a2cf
commit 2ae0352e75
115 changed files with 474 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/blackmisc/audio/audiodeviceinfolist.h
View File

@@ -86,7 +86,8 @@ namespace BlackMisc
//! Has same devices
bool hasSameDevices(const CAudioDeviceInfoList &compareDevices) const;
//! Lists of all available devices @{
//! Lists of all available devices
//! @{
static CAudioDeviceInfoList allInputDevices();
static CAudioDeviceInfoList allOutputDevices();
static CAudioDeviceInfoList allDevices();

9
src/blackmisc/audio/audiosettings.h
View File

@@ -30,14 +30,16 @@ namespace BlackMisc
class BLACKMISC_EXPORT CSettings : public CValueObject<CSettings>
{
public:
//! Ranges for audio @{
//! Ranges for audio
//! @{
static constexpr int InMax = 100;
static constexpr int InMin = 0;
static constexpr int OutMax = 100;
static constexpr int OutMin = 0;
//! @}
//! Make sure the volume is within the range @{
//! Make sure the volume is within the range
//! @{
static int fixOutVolume(int v);
static int fixInVolume(int v);
//! @}
@@ -57,7 +59,8 @@ namespace BlackMisc
//! Set notification
void setNotification(CNotificationSounds::Notification notification) { m_notification = static_cast<int>(notification); }
//! Simplified functions @{
//! Simplified functions
//! @{
bool textMessagePrivate() const { return this->isNotificationFlagSet(CNotificationSounds::NotificationTextMessagePrivate); }
bool textMessageSupervisor() const { return this->isNotificationFlagSet(CNotificationSounds::NotificationTextMessageSupervisor); }
bool textCallsignMentioned() const { return this->isNotificationFlagSet(CNotificationSounds::NotificationTextCallsignMentioned); }

4
src/blackmisc/aviation/aircraftsituation.h
View File

@@ -526,13 +526,15 @@ namespace BlackMisc
//! A default CG if not other value is available
static const PhysicalQuantities::CLength &defaultCG();
//! Ground flag comparisons
//! @{
//! Both on ground
static bool isGfEqualOnGround(double oldGroundFactor, double newGroundFactor)
{
return isDoubleEpsilonEqual(1.0, oldGroundFactor) && isDoubleEpsilonEqual(1.0, newGroundFactor);
}
//! Ground flag comparisons @{
//! Both not on ground
static bool isGfEqualAirborne(double oldGroundFactor, double newGroundFactor)
{

3
src/blackmisc/aviation/altitude.h
View File

@@ -207,7 +207,8 @@ namespace BlackMisc
//! \remark https://en.wikipedia.org/wiki/Flight_level
CAltitude roundedToNearest100ft(bool roundDown) const;
//! Search the corresponding feet <-> metric / metric <-> feet @{
//! Search the corresponding feet <-> metric / metric <-> feet
//! @{
static int findMetricAltitude(int feet);
static int findAltitudeForMetricAltitude(int metric);
//! @}

5
src/blackmisc/aviation/callsign.h
View File

@@ -124,11 +124,12 @@ namespace BlackMisc
//! Get the callsign suffix ("TWR", "ATIS" ...) if any ("_" is removed)
QString getSuffix() const;
//! Airline suffix (e.g. DLH1234 -> DLH) if applicable @{
//! Airline suffix (e.g. DLH1234 -> DLH) if applicable
//! @{
QString getAirlinePrefix() const;
QString getAirlinePrefix(QString &flightNumber) const;
QString getAirlinePrefix(QString &flightNumber, QString &flightIdentification) const;
// @}
//! @}
//! Flight number (e.g. DLH1234 -> 1234) if applicable
QString getFlightIndentification() const;

3
src/blackmisc/geo/coordinategeodetic.h
View File

@@ -136,7 +136,8 @@ namespace BlackMisc
//! \copydoc Mixin::String::toQString
QString convertToQString(bool i18n = false) const;
//! Check values @{
//! Check values
//! @{
bool isNaNVector() const;
bool isNaNVectorDouble() const;
bool isInfVector() const;

3
src/blackmisc/geo/kmlutils.h
View File

@@ -36,7 +36,8 @@ namespace BlackMisc
withAltitude(withAltitude), extrude(extrude)
{ }
//! Setting members @{
//! Setting members
//! @{
bool withAltitude = true;
bool extrude = false;
bool tessellate = true;

15
src/blackmisc/icons.h
View File

@@ -499,27 +499,32 @@ namespace BlackMisc
// -- Simulators
// --------------------------------------------------
//! Simulator FSX @{
//! Simulator FSX
//! @{
static const QPixmap &simulatorFSX();
static const QPixmap &simulatorFSX16();
//! @}
//! Simulator P3D @{
//! Simulator P3D
//! @{
static const QPixmap &simulatorP3D();
static const QPixmap &simulatorP3D16();
//! @}
//! Simulator FS9 @{
//! Simulator FS9
//! @{
static const QPixmap &simulatorFS9();
static const QPixmap &simulatorFS916();
//! @}
//! Simulator FG @{
//! Simulator FG
//! @{
static const QPixmap &simulatorFG();
static const QPixmap &simulatorFG16();
//! @}
//! Simulator XPlane @{
//! Simulator XPlane
//! @{
static const QPixmap &simulatorXPlane();
static const QPixmap &simulatorXPlane16();
//! @}

6
src/blackmisc/math/mathutils.h
View File

@@ -57,13 +57,15 @@ namespace BlackMisc
//! Round by given epsilon
static double roundEpsilon(double value, double epsilon);
//! Epsilon safe equal @{
//! Epsilon safe equal
//! @{
static bool epsilonEqual(float v1, float v2, float epsilon = 1E-06f);
static bool epsilonEqual(double v1, double v2, double epsilon = 1E-06);
static bool epsilonEqualLimits(double v1, double v2) { return qAbs(v1 - v2) <= std::numeric_limits<double>::epsilon(); }
//! @}
//! Epsilon safe zero @{
//! Epsilon safe zero
//! @{
static bool epsilonZero(double v, double epsilon) { return epsilonEqual(v, 0.0, epsilon); }
static bool epsilonZero(double v) { return epsilonEqual(v, 0.0, 1E-06); }
static inline bool epsilonZeroLimits(double v) { return qAbs(v) <= std::numeric_limits<double>::epsilon(); }

3
src/blackmisc/network/fsdsetup.h
View File

@@ -106,7 +106,8 @@ namespace BlackMisc
bool receiveInterimPositions() const { return this->getSendReceiveDetails().testFlag(ReceiveInterimPositions); }
//! @}
//! Airline codes @{
//! Airline codes
//! @{
bool force3LetterAirlineCodes() const { return this->getSendReceiveDetails().testFlag(Force3LetterAirlineICAO); }
void setForce3LetterAirlineCodes(bool force);
//! @}

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

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

18
src/blackmisc/simulation/aircraftmatchersetup.h
View File

@@ -148,7 +148,8 @@ namespace BlackMisc
//! Force mode as string
QString getForceModeAsString() const { return forceToString(this->getForceMode()); }
//! Reverse lookup @{
//! Reverse lookup
//! @{
bool isReverseLookupModelString() const;
bool isReverseLookupSwiftLiveryIds() const;
void resetReverseLookup();
@@ -157,27 +158,32 @@ namespace BlackMisc
//! DB data?
bool isDbDataOnly() const { return this->getMatchingMode().testFlag(ExcludeNoDbData); }
//! Get matching files @{
//! Get matching files
//! @{
const QString &getMsReverseLookupFile() const { return m_msReverseLookupFile; }
const QString &getMsMatchingStageFile() const { return m_msMatchingStageFile; }
//! @}
//! Set matching files @{
//! Set matching files
//! @{
void setMsReverseLookupFile(const QString &file) { m_msReverseLookupFile = file; }
void setMsMatchingStageFile(const QString &file) { m_msMatchingStageFile = file; }
//! @}
//! Is matching script enabled @{
//! Is matching script enabled
//! @{
bool isMsReverseLookupEnabled() const { return m_msReverseEnabled; }
bool isMsMatchingStageEnabled() const { return m_msMatchingEnabled; }
//! @}
//! Run the scripts @{
//! Run the scripts
//! @{
bool doRunMsReverseLookupScript() const;
bool doRunMsMatchingStageScript() const;
//! @}
//! Is matching script enabled @{
//! Is matching script enabled
//! @{
void setMsReverseLookupEnabled(bool enabled) { m_msReverseEnabled = enabled; }
void setMsMatchingStageEnabled(bool enabled) { m_msMatchingEnabled = enabled; }
//! @}

15
src/blackmisc/simulation/aircraftmodelinterfaces.h
View File

@@ -25,7 +25,8 @@ namespace BlackMisc
//! Set models
virtual void setModels(const CAircraftModelList &models) = 0;
//! Ctor, dtor, copy operators (CLANG warnings) @{
//! Ctor, dtor, copy operators (CLANG warnings)
//! @{
IModelsSetable() {}
virtual ~IModelsSetable() {}
IModelsSetable(const IModelsSetable &) = default;
@@ -40,7 +41,8 @@ namespace BlackMisc
//! Update models
virtual int updateModels(const CAircraftModelList &models) = 0;
//! Ctor, dtor, copy operators (CLANG warnings) @{
//! Ctor, dtor, copy operators (CLANG warnings)
//! @{
IModelsUpdatable() {}
virtual ~IModelsUpdatable() {}
IModelsUpdatable(const IModelsUpdatable &) = default;
@@ -55,7 +57,8 @@ namespace BlackMisc
//! Set models
virtual void setModelsForSimulator(const CAircraftModelList &models, const CSimulatorInfo &simulator) = 0;
//! Ctor, dtor, copy operators (CLANG warnings) @{
//! Ctor, dtor, copy operators (CLANG warnings)
//! @{
IModelsForSimulatorSetable() {}
virtual ~IModelsForSimulatorSetable() {}
IModelsForSimulatorSetable(const IModelsForSimulatorSetable &) = default;
@@ -70,7 +73,8 @@ namespace BlackMisc
//! Set models
virtual int updateModelsForSimulator(const CAircraftModelList &models, const CSimulatorInfo &simulator) = 0;
//! Ctor, dtor, copy operators (CLANG warnings) @{
//! Ctor, dtor, copy operators (CLANG warnings)
//! @{
IModelsForSimulatorUpdatable() {}
virtual ~IModelsForSimulatorUpdatable() {}
IModelsForSimulatorUpdatable(const IModelsForSimulatorUpdatable &) = default;
@@ -85,7 +89,8 @@ namespace BlackMisc
//! Simulator
virtual BlackMisc::Simulation::CSimulatorInfo getSelectedSimulator() const = 0;
//! Ctor, dtor, copy operators (CLANG warnings) @{
//! Ctor, dtor, copy operators (CLANG warnings)
//! @{
ISimulatorSelectable() {}
virtual ~ISimulatorSelectable() {}
ISimulatorSelectable(const ISimulatorSelectable &) = default;

18
src/blackmisc/simulation/aircraftmodellist.h
View File

@@ -220,7 +220,8 @@ namespace BlackMisc
//! Find color liveries
CAircraftModelList findColorLiveries() const;
//! Find models with the closest color distance @{
//! Find models with the closest color distance
//! @{
CAircraftModelList findClosestColorDistance(const CRgbColor &fuselage, const CRgbColor &tail) const;
CAircraftModelList findClosestFuselageColorDistance(const CRgbColor &color) const;
//! @}
@@ -264,19 +265,22 @@ namespace BlackMisc
//! All models NOT of the FS (FSX, P3D, FS9) family
CAircraftModelList findNonFsFamilyModels() const;
//! With/without DB key @{
//! With/without DB key
//! @{
CAircraftModelList findWithValidDbKey() const;
CAircraftModelList findWithoutValidDbKey() const;
CAircraftModelList findWithoutValidDbKey(int maxElements) const;
//! @}
//! Some finders for NON DB models, mostly for matching script results @{
//! Some finders for NON DB models, mostly for matching script results
//! @{
CAircraftModelList findNonDbModelsForAirline(const QString &airline) const;
CAircraftModelList findNonDbModelsForAircraft(const QString &airline) const;
CAircraftModelList findNonDbModelsForModelString(const QString &modelString) const;
//! @}
//! All included/excluded models @{
//! All included/excluded models
//! @{
CAircraftModelList findAllIncludedModels() const;
CAircraftModelList findAllIncludedModels(int maxElements) const;
CAircraftModelList findAllExcludedModels() const;
@@ -541,14 +545,16 @@ namespace BlackMisc
//! A HTML summary of the data in the list
QString htmlStatistics(bool aircraftStats, bool airlineStats) const;
//! Save/load invalid models @{
//! Save/load invalid models
//! @{
CStatusMessage saveInvalidModels() const;
CStatusMessage loadInvalidModels();
static const QString &invalidModelFileAndPath();
static bool hasInvalidModelFile();
//! @}
//! Add as valid or invalid model (mutual exclusive) @{
//! Add as valid or invalid model (mutual exclusive)
//! @{
static void addAsValidOrInvalidModel(const CAircraftModel &model, bool valid, CAircraftModelList &validModels, CAircraftModelList &invalidModels);
static void addAsValidOrInvalidModels(const CAircraftModelList &models, bool valid, CAircraftModelList &validModels, CAircraftModelList &invalidModels);
//! @}

6
src/blackmisc/simulation/aircraftmodelloader.h
View File

@@ -127,7 +127,8 @@ namespace BlackMisc
//! Supported simulator
bool supportsSimulator(const CSimulatorInfo &simulator) const { return m_simulator == simulator; }
//! Interface implementations @{
//! Interface implementations
//! @{
virtual void setModels(const CAircraftModelList &models) override;
virtual int updateModels(const CAircraftModelList &models) override;
//! @}
@@ -221,7 +222,8 @@ namespace BlackMisc
//! Singleton
static CMultiAircraftModelLoaderProvider &multiModelLoaderInstance();
//! Simulator specific loaders @{
//! Simulator specific loaders
//! @{
IAircraftModelLoader *modelLoaderFsx() const { return m_loaderFsx; }
IAircraftModelLoader *modelLoaderP3D() const { return m_loaderP3D; }
IAircraftModelLoader *modelLoaderXP() const { return m_loaderXP; }

6
src/blackmisc/simulation/autopublishdata.h
View File

@@ -63,7 +63,8 @@ namespace BlackMisc
class BLACKMISC_EXPORT CAutoPublishData
{
public:
//! Insert values we might want to update in the DB @{
//! Insert values we might want to update in the DB
//! @{
void insert(const QString &modelString, const PhysicalQuantities::CLength &cg);
void insert(const QString &modelString, const CSimulatorInfo &simulator);
//! @}
@@ -80,7 +81,8 @@ namespace BlackMisc
//! Read from database JSON
int fromDatabaseJson(const QString &jsonData, bool clear = true);
//! Write to file @{
//! Write to file
//! @{
bool writeJsonToFile() const;
bool writeJsonToFile(const QString &pathAndFile) const;
//! @}

3
src/blackmisc/simulation/categorymatcher.h
View File

@@ -37,7 +37,8 @@ namespace BlackMisc
//! Used categories
void setCategories(const Aviation::CAircraftCategoryList &categories);
//! Specialized categories @{
//! Specialized categories
//! @{
const Aviation::CAircraftCategoryList &gliderCategories() const { return m_gliders; }
const Aviation::CAircraftCategoryList &militaryWingCategories() const { return m_militaryWingAircraft; }
const Aviation::CAircraftCategoryList &militaryRotorCategories() const { return m_militaryRotorAircraft; }

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

@@ -283,7 +283,8 @@ namespace BlackMisc
IMultiSimulatorModelCaches(QObject *parent = nullptr) : QObject(parent)
{ }
//! \name Cache has been changed. This will only detect changes elsewhere, owned caches will not signal local changes @{
//! Cache has been changed. This will only detect changes elsewhere, owned caches will not signal local changes
//! @{
void changedFsx() { this->emitCacheChanged(CSimulatorInfo::fsx()); }
void changedFs9() { this->emitCacheChanged(CSimulatorInfo::fs9()); }
void changedP3D() { this->emitCacheChanged(CSimulatorInfo::p3d()); }
@@ -298,7 +299,8 @@ namespace BlackMisc
//! Emit cacheChanged() utility function (allows breakpoint)
void emitCacheChanged(const CSimulatorInfo &simulator);
//! Cache synchronized flag @{
//! Cache synchronized flag
//! @{
std::atomic_bool m_syncFsx { false };
std::atomic_bool m_syncP3D { false };
std::atomic_bool m_syncFS9 { false };
@@ -456,7 +458,7 @@ namespace BlackMisc
public IModelsForSimulatorUpdatable
{
public:
//! \name Look like IMultiSimulatorModelCaches interface
//! Look like IMultiSimulatorModelCaches interface
//! @{
CAircraftModelList getCachedModels(const CSimulatorInfo &simulator) const { return CCentralMultiSimulatorModelCachesProvider::modelCachesInstance().getCachedModels(simulator); }
int getCachedModelsCount(const CSimulatorInfo &simulator) const { return CCentralMultiSimulatorModelCachesProvider::modelCachesInstance().getCachedModelsCount(simulator); }
@@ -509,7 +511,7 @@ namespace BlackMisc
public IModelsForSimulatorUpdatable
{
public:
//! \name Look like IMultiSimulatorModelCaches interface
//! Look like IMultiSimulatorModelCaches interface
//! @{
CAircraftModelList getCachedModels(const CSimulatorInfo &simulator) const { return CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance().getCachedModels(simulator); }
int getCachedModelsCount(const CSimulatorInfo &simulator) const { return CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance().getCachedModelsCount(simulator); }

3
src/blackmisc/simulation/distributor.h
View File

@@ -125,7 +125,8 @@ namespace BlackMisc
//! Object from JSON
static CDistributor fromDatabaseJson(const QJsonObject &json, const QString &prefix = QString());
//! Hardcoded keys for standard models @{
//! Hardcoded keys for standard models
//! @{
static const QString &standardFSX();
static const QString &standardP3D();
static const QString &standardFS9();

3
src/blackmisc/simulation/fscommon/fscommonutil.h
View File

@@ -157,7 +157,8 @@ namespace BlackMisc
static const QString airFileFilter();
private:
//! Utility functions @{
//! Utility functions
//! @{
static QSet<QString> findP3dConfigFiles(const QString &configFile, const QString &versionHint = "v5");
//! @}

6
src/blackmisc/simulation/interpolator.h
View File

@@ -165,7 +165,8 @@ namespace BlackMisc
//! Reset values
void reset();
//! Implicit conversion @{
//! Implicit conversion
//! @{
operator const Aviation::CAircraftSituation &() const { return m_interpolatedSituation; }
operator const Aviation::CAircraftParts &() const { return m_interpolatedParts; }
//! @}
@@ -324,7 +325,8 @@ namespace BlackMisc
//! Return NULL parts and log
const BlackMisc::Aviation::CAircraftParts &logAndReturnNullParts(const QString &info, bool log);
//! Derived class @{
//! Derived class
//! @{
Derived *derived() { return static_cast<Derived *>(this); }
const Derived *derived() const { return static_cast<const Derived *>(this); }
//! @}

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

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

45
src/blackmisc/simulation/matchingscript.h
View File

@@ -29,7 +29,8 @@ namespace BlackMisc
{
Q_OBJECT
//! MSNetworkValues properties @{
//! MSNetworkValues properties
//! @{
Q_PROPERTY(QString callsign READ getCallsign WRITE setCallsign NOTIFY callsignChanged)
Q_PROPERTY(QString callsignAsSet READ getCallsignAsSet)
Q_PROPERTY(QString flightNumber READ getFlightNumber)
@@ -94,14 +95,16 @@ namespace BlackMisc
//! Ctor
MSInOutValues(const MSInOutValues &sv);
//! Callsign values @{
//! Callsign values
//! @{
const QString &getCallsign() const { return m_callsign; }
const QString &getCallsignAsSet() const { return m_callsignAsSet; }
const QString &getFlightNumber() const { return m_flightNumber; }
void setCallsign(const QString &callsign);
//! @}
//! Values found in DB? @{
//! Values found in DB?
//! @{
bool isFoundDbAircraftIcao() const { return m_dbAircraftIcaoId >= 0; }
bool isFoundDbAirlineIcao() const { return m_dbAirlineIcaoId >= 0; }
bool isFoundDbLivery() const { return m_dbLiveryId >= 0; }
@@ -116,7 +119,8 @@ namespace BlackMisc
void setDbModelId(int id);
//! @}
//! Livery, airline, aircraft, model string @{
//! Livery, airline, aircraft, model string
//! @{
const QString &getAircraftIcao() const { return m_aircraftIcao; }
const QString &getAircraftFamily() const { return m_aircraftFamily; }
const QString &getAirlineIcao() const { return m_airlineIcao; }
@@ -135,17 +139,20 @@ namespace BlackMisc
bool hasAircraftFamily() const { return !m_aircraftFamily.isEmpty(); }
//! @}
//! Log. message @{
//! Log. message
//! @{
const QString &getLogMessage() const { return m_logMessage; }
void setLogMessage(const QString &msg);
//! @}
//! Modified flag @{
//! Modified flag
//! @{
bool isModified() const { return m_modified; }
void setModified(bool modified);
//! @}
//! Request re-run @{
//! Request re-run
//! @{
bool isRerun() const { return m_rerun; }
void setRerun(bool rerun);
//! @}
@@ -153,7 +160,8 @@ namespace BlackMisc
//! Changed values such as modified values
void evaluateChanges(const BlackMisc::Aviation::CAircraftIcaoCode &aircraft, const BlackMisc::Aviation::CAirlineIcaoCode &airline);
//! Changed values @{
//! Changed values
//! @{
bool hasModifiedAircraftIcaoDesignator() const { return m_modifiedAircraftDesignator; }
bool hasModifiedAirlineIcaoDesignator() const { return m_modifiedAirlineDesignator; }
bool hasModifiedAircraftFamily() const { return m_modifiedAircraftFamily; }
@@ -172,7 +180,8 @@ namespace BlackMisc
//! Callsign changed
void callsignChanged();
//! Livery, airline, aircraft, or model changed @{
//! Livery, airline, aircraft, or model changed
//! @{
void aircraftIcaoChanged();
void airlineIcaoChanged();
void virtualAirlineIcaoChanged();
@@ -181,7 +190,8 @@ namespace BlackMisc
void combinedTypeChanged();
//! @}
//! DB id changed @{
//! DB id changed
//! @{
void dbAircraftIcaoIdChanged();
void dbAirlineIcaoIdChanged();
void dbLiveryIdChanged();
@@ -225,7 +235,8 @@ namespace BlackMisc
{
Q_OBJECT
//! MSModelSet properties @{
//! MSModelSet properties
//! @{
Q_PROPERTY(QString simulator READ getSimulator WRITE setSimulator NOTIFY simulatorChanged)
Q_PROPERTY(bool available READ isAvailable WRITE setAvailable NOTIFY availabilityChanged)
Q_PROPERTY(int inputAircraftAndAirlineCount READ getInputAircraftAndAirlineCount WRITE setInputAircraftAndAirlineCount NOTIFY inputAircraftAndAirlineCountChanged)
@@ -248,17 +259,20 @@ namespace BlackMisc
//! Set callsign
void setSimulator(const QString &simulator);
//! Availablity flag @{
//! Availablity flag
//! @{
bool isAvailable() const { return m_available; }
void setAvailable(bool available);
//! @}
//! Input aircraft/airline available flag @{
//! Input aircraft/airline available flag
//! @{
int getInputAircraftAndAirlineCount() const { return m_inputAircraftAndAirlineCount; }
void setInputAircraftAndAirlineCount(int count);
//! @}
//! Model set functions as properties @{
//! Model set functions as properties
//! @{
int getModelSetSize() const { return m_modelSet.size(); }
int countDifferentAirlines() const { return m_modelSet.countDifferentAirlines(); }
int countVtolAircraft() const { return m_modelSet.countVtolAircraft(); }
@@ -268,7 +282,8 @@ namespace BlackMisc
int countModelsWithAirlineLivery() const { return m_modelSet.countModelsWithAirlineLivery(); }
//! @}
//! Invokable model set functions as properties @{
//! Invokable model set functions as properties
//! @{
Q_INVOKABLE bool containsModelString(const QString &modelString) const { return m_modelSet.containsModelString(modelString, Qt::CaseInsensitive); }
Q_INVOKABLE bool containsDbKey(int dbKey) const { return m_modelSet.containsDbKey(dbKey); }
Q_INVOKABLE bool containsCombinedType(const QString &ct) const { return m_modelSet.containsCombinedType(ct); }

3
src/blackmisc/simulation/remoteaircraftprovider.h
View File

@@ -204,8 +204,9 @@ namespace BlackMisc
//! \threadsafe
virtual bool updateCGAndModelString(const Aviation::CCallsign &callsign, const PhysicalQuantities::CLength &cg, const QString &modelString) = 0;
//! CG values from DB @{
//! CG values from DB
//! \threadsafe
//! @{
virtual PhysicalQuantities::CLength getCGFromDB(const Aviation::CCallsign &callsign) const = 0;
virtual PhysicalQuantities::CLength getCGFromDB(const QString &modelString) const = 0;
virtual void rememberCGFromDB(const PhysicalQuantities::CLength &cgFromDB, const Aviation::CCallsign &callsign) = 0;

3
src/blackmisc/simulation/settings/simulatorsettings.h
View File

@@ -503,7 +503,8 @@ namespace BlackMisc
CSetting<Settings::TSimulatorXP> m_simSettingsXP { this, &CMultiSimulatorSettings::onXPSettingsChanged }; //!< XP settings
CSetting<Settings::TSimulatorFG> m_simSettingsFG { this, &CMultiSimulatorSettings::onFGSettingsChanged }; //!< FG settings
//! Settings changed, this will only detect if settings are changed elsewhere @{
//! Settings changed, this will only detect if settings are changed elsewhere
//! @{
void onFsxSettingsChanged();
void onFs9SettingsChanged();
void onP3DSettingsChanged();

3
src/blackmisc/simulation/settings/xswiftbussettingsqtfree.h
View File

@@ -160,7 +160,8 @@ namespace BlackMisc
}
protected:
//! The JSON members @{
//! The JSON members
//! @{
static constexpr char JsonDBusServerAddress[] = "dbusserveradress";
static constexpr char JsonDrawingLabels[] = "drawinglabels";
static constexpr char JsonLogRenderPhases[] = "renderPhases";

3
src/blackmisc/simulation/simulatorinfo.h
View File

@@ -202,7 +202,8 @@ namespace BlackMisc
//! From database JSON
static CSimulatorInfo fromDatabaseJson(const QJsonObject &json, const QString &prefix);
//! Const simulator info objects @{
//! Const simulator info objects
//! @{
static const CSimulatorInfo &fg() { static const CSimulatorInfo s(FG); return s; }
static const CSimulatorInfo &fsx() { static const CSimulatorInfo s(FSX); return s; }
static const CSimulatorInfo &p3d() { static const CSimulatorInfo s(P3D); return s; }