Browse Source

Handle temperature units

QGC4.4
Gus Grubba 7 years ago
parent
commit
be0901cc89
  1. 16
      src/Airmap/AirspaceWeather.qml

16
src/Airmap/AirspaceWeather.qml

@ -4,11 +4,12 @@ import QtQuick.Controls.Styles 1.4 @@ -4,11 +4,12 @@ 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
@ -16,6 +17,9 @@ Item { @@ -16,6 +17,9 @@ Item {
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 { @@ -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

Loading…
Cancel
Save