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
b92e685d
Unverified
Commit
b92e685d
authored
May 18, 2018
by
Don Gagne
Committed by
GitHub
May 18, 2018
Browse files
Merge pull request #6463 from DonLakeFlyer/TerrainStatus
Show indicator for mission terrain data
parents
b53af497
d447968e
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/PlanView/MissionItemStatus.qml
View file @
b92e685d
...
...
@@ -72,9 +72,9 @@ Rectangle {
width
:
display
?
(
indicator
.
width
+
spacing
)
:
0
visible
:
display
property
real
availableHeight
:
height
-
indicator
.
height
property
bool
showT
errain
:
!
isNaN
(
object
.
terrainPercent
)
property
real
_terrainPercent
:
showTerrain
?
object
.
terrainPercent
:
0
property
real
availableHeight
:
height
-
indicator
.
height
property
bool
_t
errain
Available
:
!
isNaN
(
object
.
terrainPercent
)
property
real
_terrainPercent
:
_terrainAvailable
?
object
.
terrainPercent
:
1
readonly
property
bool
display
:
object
.
specifiesCoordinate
&&
!
object
.
isStandaloneCoordinate
readonly
property
real
spacing
:
ScreenTools
.
defaultFontPixelWidth
*
ScreenTools
.
smallFontPointRatio
...
...
@@ -83,9 +83,8 @@ Rectangle {
anchors.bottom
:
parent
.
bottom
anchors.horizontalCenter
:
parent
.
horizontalCenter
width
:
indicator
.
width
height
:
Math
.
max
(
availableHeight
*
_terrainPercent
,
1
)
color
:
_terrainPercent
>
object
.
altPercent
?
"
red
"
:
qgcPal
.
text
visible
:
!
isNaN
(
object
.
terrainPercent
)
height
:
_terrainAvailable
?
Math
.
max
(
availableHeight
*
_terrainPercent
,
1
)
:
parent
.
height
color
:
_terrainAvailable
?
(
_terrainPercent
>
object
.
altPercent
?
"
red
"
:
qgcPal
.
text
)
:
"
yellow
"
}
MissionItemIndexLabel
{
...
...
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