Skip to content

Q
qgroundcontrol
Commit be0901cc authored by Gus Grubba's avatar Gus Grubba
Browse files
Options

Handle temperature units

parent 2eefe4fa
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 6 deletions
src/Airmap/AirspaceWeather.qml
View file @ be0901cc
......@@ -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 {
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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment