Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Q
qgroundcontrol
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Valentin Platzgummer
qgroundcontrol
Commits
be0901cc
Commit
be0901cc
authored
7 years ago
by
Gus Grubba
Browse files
Options
Downloads
Patches
Plain Diff
Handle temperature units
parent
2eefe4fa
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/Airmap/AirspaceWeather.qml
+10
-6
10 additions, 6 deletions
src/Airmap/AirspaceWeather.qml
with
10 additions
and
6 deletions
src/Airmap/AirspaceWeather.qml
+
10
−
6
View file @
be0901cc
...
...
@@ -9,6 +9,7 @@ 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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment