Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
00f26652
Commit
00f26652
authored
Oct 11, 2015
by
Lorenz Meier
Browse files
Battery toolbar: Do not indicate any voltage for cases where the voltage is unknown
parent
101adaf3
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/ui/toolbar/MainToolBar.qml
View file @
00f26652
...
@@ -495,7 +495,7 @@ Rectangle {
...
@@ -495,7 +495,7 @@ Rectangle {
anchors.rightMargin
:
getProportionalDimmension
(
6
)
anchors.rightMargin
:
getProportionalDimmension
(
6
)
visible
:
batteryStatus
.
visible
&&
activeVehicle
.
batteryConsumed
>=
0.0
visible
:
batteryStatus
.
visible
&&
activeVehicle
.
batteryConsumed
>=
0.0
QGCLabel
{
QGCLabel
{
text
:
activeVehicle
.
batteryVoltage
.
toFixed
(
1
)
+
'
V
'
;
text
:
(
activeVehicle
.
batteryVoltage
>
0
)
?
activeVehicle
.
batteryVoltage
.
toFixed
(
1
)
+
'
V
'
:
'
---
'
;
width
:
getProportionalDimmension
(
30
)
width
:
getProportionalDimmension
(
30
)
horizontalAlignment
:
Text
.
AlignRight
horizontalAlignment
:
Text
.
AlignRight
font.pixelSize
:
ScreenTools
.
smallFontPixelSize
font.pixelSize
:
ScreenTools
.
smallFontPixelSize
...
@@ -503,7 +503,7 @@ Rectangle {
...
@@ -503,7 +503,7 @@ Rectangle {
color
:
colorWhite
color
:
colorWhite
}
}
QGCLabel
{
QGCLabel
{
text
:
activeVehicle
.
batteryConsumed
.
toFixed
(
0
)
+
'
mAh
'
;
text
:
(
activeVehicle
.
batteryConsumed
>
0
)
?
activeVehicle
.
batteryConsumed
.
toFixed
(
0
)
+
'
mAh
'
:
'
---
'
;
width
:
getProportionalDimmension
(
30
)
width
:
getProportionalDimmension
(
30
)
horizontalAlignment
:
Text
.
AlignRight
horizontalAlignment
:
Text
.
AlignRight
font.pixelSize
:
ScreenTools
.
smallFontPixelSize
font.pixelSize
:
ScreenTools
.
smallFontPixelSize
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment