Browse Source

appSettingsSpeedUnitsString() method added

QGC4.4
Aleksey Kontsevich 5 years ago
parent
commit
abeb22db9f
  1. 9
      src/FactSystem/FactMetaData.cc
  2. 3
      src/FactSystem/FactMetaData.h
  3. 4
      src/QmlControls/QmlUnitsConversion.h

9
src/FactSystem/FactMetaData.cc

@ -1198,6 +1198,15 @@ QVariant FactMetaData::appSettingsWeightUnitsToGrams(const QVariant& weight) { @@ -1198,6 +1198,15 @@ QVariant FactMetaData::appSettingsWeightUnitsToGrams(const QVariant& weight) {
}
}
QString FactMetaData::appSettingsSpeedUnitsString()
{
const AppSettingsTranslation_s* pAppSettingsTranslation = _findAppSettingsHorizontalDistanceUnitsTranslation("m/s");
if (pAppSettingsTranslation) {
return pAppSettingsTranslation->cookedUnits;
} else {
return QStringLiteral("m/s");
}
}
double FactMetaData::cookedIncrement(void) const
{

3
src/FactSystem/FactMetaData.h

@ -95,6 +95,9 @@ public: @@ -95,6 +95,9 @@ public:
/// Returns the string for distance units which has configued by user
static QString appSettingsAreaUnitsString(void);
/// Returns the string for speed units which has configued by user
static QString appSettingsSpeedUnitsString();
static const QString defaultCategory ();
static const QString defaultGroup ();

4
src/QmlControls/QmlUnitsConversion.h

@ -25,6 +25,7 @@ public: @@ -25,6 +25,7 @@ public:
Q_PROPERTY(QString appSettingsVerticalDistanceUnitsString READ appSettingsVerticalDistanceUnitsString CONSTANT)
Q_PROPERTY(QString appSettingsAreaUnitsString READ appSettingsAreaUnitsString CONSTANT)
Q_PROPERTY(QString appSettingsWeightUnitsString READ appSettingsWeightUnitsString CONSTANT)
Q_PROPERTY(QString appSettingsSpeedUnitsString READ appSettingsSpeedUnitsString CONSTANT)
/// Converts from meters to the user specified distance unit
Q_INVOKABLE QVariant metersToAppSettingsHorizontalDistanceUnits(const QVariant& meters) const { return FactMetaData::metersToAppSettingsHorizontalDistanceUnits(meters); }
@ -58,6 +59,9 @@ public: @@ -58,6 +59,9 @@ public:
QString appSettingsAreaUnitsString(void) const { return FactMetaData::appSettingsAreaUnitsString(); }
/// Returns the string for speed units which has configued by user
QString appSettingsSpeedUnitsString() { return FactMetaData::appSettingsSpeedUnitsString(); }
Q_INVOKABLE double degreesToRadians(double degrees) { return qDegreesToRadians(degrees); }
Q_INVOKABLE double radiansToDegrees(double radians) { return qRadiansToDegrees(radians); }
};

Loading…
Cancel
Save