Handle temperature units

Fr33zz · Jan 27, 2018 · be0901c · be0901c
1 parent 2eefe4f
commit be0901c
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src/Airmap/AirspaceWeather.qml b/src/Airmap/AirspaceWeather.qml
@@ -4,18 +4,22 @@ import QtQuick.Controls.Styles  1.4
 import QtQuick.Dialogs          1.2
 import QtQml                    2.2
 
-import QGroundControl               1.0
-import QGroundControl.ScreenTools   1.0
-import QGroundControl.Controls      1.0
-import QGroundControl.Palette       1.0
-import QGroundControl.Airmap        1.0
+import QGroundControl                   1.0
+import QGroundControl.ScreenTools       1.0
+import QGroundControl.Controls          1.0
+import QGroundControl.Palette           1.0
+import QGroundControl.Airmap            1.0
+import QGroundControl.SettingsManager   1.0
 
 Item {
     height: _activeVehicle && _activeVehicle.airspaceController.hasWeather ? weatherRow.height : 0
     width:  _activeVehicle && _activeVehicle.airspaceController.hasWeather ? weatherRow.width  : 0
     property var    iconHeight:         ScreenTools.defaultFontPixelWidth * 4
     property color  _colorWhite:        "#ffffff"
     property var    _activeVehicle:     QGroundControl.multiVehicleManager.activeVehicle
+    property bool   _celcius:           QGroundControl.settingsManager.unitsSettings.temperatureUnits.rawValue === UnitsSettings.TemperatureUnitsCelsius
+    property int    _tempC:             _activeVehicle ? _activeVehicle.airspaceController.weatherTemp : 0
+    property string _tempS:             (_celcius ? _tempC : _tempC * 1.8 + 32).toFixed(0) + (_celcius ? "°C" : "°F")
     Row {
         id:                     weatherRow
         spacing:                ScreenTools.defaultFontPixelHeight * 0.5
@@ -29,7 +33,7 @@ Item {
             anchors.verticalCenter: parent.verticalCenter
         }
         QGCLabel {
-            text:                   _activeVehicle ? _activeVehicle.airspaceController.weatherTemp + "<sup>º</sup>C" : ""
+            text:                   _tempS
             color:                  _colorWhite
             visible:                _activeVehicle && _activeVehicle.airspaceController.hasWeather
             anchors.verticalCenter: parent.verticalCenter