Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
09c886a5
Unverified
Commit
09c886a5
authored
Mar 15, 2020
by
Don Gagne
Committed by
GitHub
Mar 15, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8568 from DonLakeFlyer/VisualItemSeqNum
Bring back visual sequence number in map item indicators
parents
26f1bdf0
a1aaf65a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
MissionItemIndicator.qml
src/FlightMap/MapItems/MissionItemIndicator.qml
+2
-1
MissionItemIndexLabel.qml
src/QmlControls/MissionItemIndexLabel.qml
+1
-1
No files found.
src/FlightMap/MapItems/MissionItemIndicator.qml
View file @
09c886a5
...
@@ -31,7 +31,8 @@ MapQuickItem {
...
@@ -31,7 +31,8 @@ MapQuickItem {
MissionItemIndexLabel
{
MissionItemIndexLabel
{
id
:
_label
id
:
_label
checked
:
_isCurrentItem
checked
:
_isCurrentItem
label
:
missionItem
?
missionItem
.
abbreviation
:
""
label
:
missionItem
.
abbreviation
index
:
missionItem
.
abbreviation
.
charAt
(
0
)
>
'
A
'
&&
missionItem
.
abbreviation
.
charAt
(
0
)
<
'
z
'
?
-
1
:
missionItem
.
sequenceNumber
gimbalYaw
:
missionItem
.
missionGimbalYaw
gimbalYaw
:
missionItem
.
missionGimbalYaw
vehicleYaw
:
missionItem
.
missionVehicleYaw
vehicleYaw
:
missionItem
.
missionVehicleYaw
showGimbalYaw
:
!
isNaN
(
missionItem
.
missionGimbalYaw
)
showGimbalYaw
:
!
isNaN
(
missionItem
.
missionGimbalYaw
)
...
...
src/QmlControls/MissionItemIndexLabel.qml
View file @
09c886a5
...
@@ -25,7 +25,7 @@ Canvas {
...
@@ -25,7 +25,7 @@ Canvas {
property
real
gimbalYaw
property
real
gimbalYaw
property
real
vehicleYaw
property
real
vehicleYaw
property
bool
showGimbalYaw
:
false
property
bool
showGimbalYaw
:
false
property
bool
showSequenceNumbers
:
fals
e
property
bool
showSequenceNumbers
:
tru
e
property
real
_width
:
showGimbalYaw
?
Math
.
max
(
_gimbalYawWidth
,
labelControl
.
visible
?
labelControl
.
width
:
indicator
.
width
)
:
(
labelControl
.
visible
?
labelControl
.
width
:
indicator
.
width
)
property
real
_width
:
showGimbalYaw
?
Math
.
max
(
_gimbalYawWidth
,
labelControl
.
visible
?
labelControl
.
width
:
indicator
.
width
)
:
(
labelControl
.
visible
?
labelControl
.
width
:
indicator
.
width
)
property
real
_height
:
showGimbalYaw
?
_gimbalYawWidth
:
(
labelControl
.
visible
?
labelControl
.
height
:
indicator
.
height
)
property
real
_height
:
showGimbalYaw
?
_gimbalYawWidth
:
(
labelControl
.
visible
?
labelControl
.
height
:
indicator
.
height
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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