This commit is contained in:
Klaus Basan
2018-06-27 18:19:32 +02:00
parent 7e8c0cc99d
commit 6bcded9264
8 changed files with 46 additions and 46 deletions

View File

@@ -121,20 +121,20 @@ namespace BlackCore
//! Trait for global setup data
struct TVatsimSetup : public BlackMisc::TDataTrait<CVatsimSetup>
{
//! Key in data cache
//! \copydoc BlackCore::TDataTrait::key
static const char *key() { return "vatsimsetup"; }
//! First load is synchronous
//! \copydoc BlackCore::TDataTrait::isPinned
static constexpr bool isPinned() { return true; }
};
//! Trait for last (most recently) used VATSIM server and user
struct TVatsimLastServer : public BlackMisc::TDataTrait<BlackMisc::Network::CServer>
{
//! Key in data cache
//! \copydoc BlackCore::TDataTrait::isPinned
static const char *key() { return "vatsimserver"; }
//! First load is synchronous
//! \copydoc BlackCore::TDataTrait::isPinned
static constexpr bool isPinned() { return true; }
};
} // ns

View File

@@ -318,7 +318,7 @@ namespace BlackGui
//! Object has been double clicked
void objectDoubleClicked(const BlackMisc::CVariant &object);
//! Object has been double clicked
//! Object has been selected
void objectSelected(const BlackMisc::CVariant &object);
//! Objects deleted from model

View File

@@ -30,7 +30,7 @@ namespace BlackMisc
//! Value object encapsulating a list of hotkeys
class BLACKMISC_EXPORT CActionHotkeyList :
public CSequence<CActionHotkey>,
public BlackMisc::Mixin::MetaType<CActionHotkeyList>
public Mixin::MetaType<CActionHotkeyList>
{
public:
BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CActionHotkeyList)

View File

@@ -24,10 +24,10 @@ namespace BlackMisc
//! Trait for last (most recently) used server and user
struct TLastServer : public TDataTrait<CServer>
{
//! Key in data cache
//! \copydoc BlackCore::TDataTrait::key
static const char *key() { return "lastserver"; }
//! First load is synchronous
//! \copydoc BlackCore::TDataTrait::isPinned
static constexpr bool isPinned() { return true; }
};
} // ns

View File

@@ -555,4 +555,4 @@ Q_DECLARE_METATYPE(BlackMisc::CSequence<qlonglong>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<qulonglong>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<double>)
#endif //BLACKMISC_SEQUENCE_H
#endif // guard

View File

@@ -85,7 +85,7 @@ namespace BlackMisc
//! \copydoc BlackMisc::Mixin::String::toQString
QString convertToQString(bool i18n = false) const;
//! To string
//! \copydoc BlackMisc::Mixin::String::toQString
QString convertToQString(const QString &separator, bool i18n = false) const;
//! \copydoc BlackMisc::Mixin::Index::propertyByIndex
@@ -196,7 +196,7 @@ namespace BlackMisc
static const char *key() { return "settingssimulatorfsx"; }
//! \copydoc BlackCore::TSettingTrait::humanReadable
static const QString &humanReadable() { static const QString name("FSX"); return name; }
static const QString &humanReadable() { static const QString name("FSX settings"); return name; }
};
//! Trait for simulator settings
@@ -206,7 +206,7 @@ namespace BlackMisc
static const char *key() { return "settingssimulatorfs9"; }
//! \copydoc BlackCore::TSettingTrait::humanReadable
static const QString &humanReadable() { static const QString name("FS9"); return name; }
static const QString &humanReadable() { static const QString name("FS9 settings"); return name; }
};
//! Trait for simulator settings
@@ -216,7 +216,7 @@ namespace BlackMisc
static const char *key() { return "settingssimulatorp3d"; }
//! \copydoc BlackCore::TSettingTrait::humanReadable
static const QString &humanReadable() { static const QString name("P3D"); return name; }
static const QString &humanReadable() { static const QString name("P3D settings"); return name; }
};
//! Trait for simulator settings
@@ -226,7 +226,7 @@ namespace BlackMisc
static const char *key() { return "settingssimulatorxplane"; }
//! \copydoc BlackCore::TSettingTrait::humanReadable
static const QString &humanReadable() { static const QString name("XPlane"); return name; }
static const QString &humanReadable() { static const QString name("XPlane settings"); return name; }
};
//! Bundle of settings for all simulators

View File

@@ -732,7 +732,7 @@ namespace BlackMisc
emit valuesWantToCache({ { { element.m_key, value } }, timestamp, save });
}
// All good info
status = CStatusMessage(this).info("Set value %1") << element.m_nameWithKey;
status = CStatusMessage(this).info("Set value '%1'") << element.m_nameWithKey;
}
return status;
}

View File

@@ -29,41 +29,41 @@ namespace BlackSimPlugin
//! \sa SimConnect events http://msdn.microsoft.com/en-us/library/cc526980.aspx
struct DataDefinitionOwnAircraft
{
double latitude; //!< Latitude (deg)
double longitude; //!< Longitude (deg)
double altitude; //!< Altitude (ft)
double altitudeAGL; //!< Altitude above ground (ft)
double pressureAltitude; //!< Pressure altitude (m)
double cgToGround; //!< Static CG to ground (ft)
double trueHeading; //!< True heading (deg)
double pitch; //!< Pitch (deg)
double bank; //!< Bank (deg)
double velocity; //!< Ground velocity
double elevation; //!< Elevation (ft)
double simOnGround; //!< Is aircraft on ground?
double latitude; //!< Latitude (deg)
double longitude; //!< Longitude (deg)
double altitude; //!< Altitude (ft)
double altitudeAGL; //!< Altitude above ground (ft)
double pressureAltitude; //!< Pressure altitude (m)
double cgToGround; //!< Static CG to ground (ft)
double trueHeading; //!< True heading (deg)
double pitch; //!< Pitch (deg)
double bank; //!< Bank (deg)
double velocity; //!< Ground velocity
double elevation; //!< Elevation (ft)
double simOnGround; //!< Is aircraft on ground?
double lightStrobe; //!< Is strobe light on?
double lightLanding; //!< Is landing light on?
double lightTaxi; //!< Is taxi light on?
double lightBeacon; //!< Is beacon light on?
double lightNav; //!< Is nav light on?
double lightLogo; //!< Is logo light on?
double lightStrobe; //!< Is strobe light on?
double lightLanding; //!< Is landing light on?
double lightTaxi; //!< Is taxi light on?
double lightBeacon; //!< Is beacon light on?
double lightNav; //!< Is nav light on?
double lightLogo; //!< Is logo light on?
double transponderCode; //!< Transponder Code
double com1ActiveMHz; //!< COM1 active frequency
double com2ActiveMHz; //!< COM2 active frequency
double com1StandbyMHz; //!< COM1 standby frequency
double com2StandbyMHz; //!< COM1 standby frequency
double transponderCode; //!< Transponder Code
double com1ActiveMHz; //!< COM1 active frequency
double com2ActiveMHz; //!< COM2 active frequency
double com1StandbyMHz; //!< COM1 standby frequency
double com2StandbyMHz; //!< COM1 standby frequency
double flapsHandlePosition; //!< Flaps handle position in percent
double spoilersHandlePosition; //!< Spoilers out?
double gearHandlePosition; //!< Gear handle position
double flapsHandlePosition; //!< Flaps handle position in percent
double spoilersHandlePosition; //!< Spoilers out?
double gearHandlePosition; //!< Gear handle position
double numberOfEngines; //!< Number of engines
double engine1Combustion; //!< Engine 1 combustion flag
double engine2Combustion; //!< Engine 2 combustion flag
double engine3Combustion; //!< Engine 3 combustion flag
double engine4Combustion; //!< Engine 4 combustion flag
double numberOfEngines; //!< Number of engines
double engine1Combustion; //!< Engine 1 combustion flag
double engine2Combustion; //!< Engine 2 combustion flag
double engine3Combustion; //!< Engine 3 combustion flag
double engine4Combustion; //!< Engine 4 combustion flag
};
//! Data struct of aircraft position