Merge pull request #6070 from mavlink/pr-fixUnits

Fix unit translators

Merge pull request #6070 from mavlink/pr-fixUnits
Fix unit translators
6ab2f53b · Gus Grubba · GitHub · cdb4cdfd · 8a3f185e · 6ab2f53b
Unverified Commit 6ab2f53b authored Jan 31, 2018 by Gus Grubba Committed by GitHub Jan 31, 2018
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 44 additions and 41 deletions

FactMetaData.cc src/FactSystem/FactMetaData.cc +31 -34

FactMetaData.h src/FactSystem/FactMetaData.h +13 -7

No files found.
--- a/src/FactSystem/FactMetaData.cc
+++ b/src/FactSystem/FactMetaData.cc
--- a/src/FactSystem/FactMetaData.h
+++ b/src/FactSystem/FactMetaData.h
@@ -205,14 +205,20 @@ private:
    static QVariant _celsiusToFarenheit(const QVariant& celsius);
    static QVariant _farenheitToCelsius(const QVariant& farenheit);

-    struct AppSettingsTranslation_s {
-        const char* rawUnits;
-        const char* cookedUnits;
-        bool        speed;
-        uint32_t    speedOrDistanceUnits;
-        Translator  rawTranslator;
-        Translator  cookedTranslator;
+    enum UnitTypes {
+        UnitDistance = 0,
+        UnitArea,
+        UnitSpeed,
+        UnitTemperature
+    };

+    struct AppSettingsTranslation_s {
+        const char*     rawUnits;
+        const char*     cookedUnits;
+        UnitTypes       unitType;
+        uint32_t        unitOption;
+        Translator      rawTranslator;
+        Translator      cookedTranslator;
    };

    static const AppSettingsTranslation_s* _findAppSettingsDistanceUnitsTranslation(const QString& rawUnits);