From abeb22db9fe44302b4a5e253ddc18ac9f065b150 Mon Sep 17 00:00:00 2001 From: Aleksey Kontsevich Date: Tue, 9 Jun 2020 16:49:24 +0300 Subject: [PATCH] appSettingsSpeedUnitsString() method added --- src/FactSystem/FactMetaData.cc | 9 +++++++++ src/FactSystem/FactMetaData.h | 3 +++ src/QmlControls/QmlUnitsConversion.h | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/src/FactSystem/FactMetaData.cc b/src/FactSystem/FactMetaData.cc index c870a0b60..3b7ff41a4 100644 --- a/src/FactSystem/FactMetaData.cc +++ b/src/FactSystem/FactMetaData.cc @@ -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 { diff --git a/src/FactSystem/FactMetaData.h b/src/FactSystem/FactMetaData.h index 31f4fbec1..5c833f719 100644 --- a/src/FactSystem/FactMetaData.h +++ b/src/FactSystem/FactMetaData.h @@ -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 (); diff --git a/src/QmlControls/QmlUnitsConversion.h b/src/QmlControls/QmlUnitsConversion.h index 09d47ffc8..267503dc7 100644 --- a/src/QmlControls/QmlUnitsConversion.h +++ b/src/QmlControls/QmlUnitsConversion.h @@ -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: 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); } }; -- 2.22.0