Browse Source

Merge pull request #8568 from DonLakeFlyer/VisualItemSeqNum

Bring back visual sequence number in map item indicators
QGC4.4
Don Gagne 5 years ago committed by GitHub
parent
commit
09c886a567
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      src/FlightMap/MapItems/MissionItemIndicator.qml
  2. 2
      src/QmlControls/MissionItemIndexLabel.qml

3
src/FlightMap/MapItems/MissionItemIndicator.qml

@ -31,7 +31,8 @@ MapQuickItem { @@ -31,7 +31,8 @@ MapQuickItem {
MissionItemIndexLabel {
id: _label
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
vehicleYaw: missionItem.missionVehicleYaw
showGimbalYaw: !isNaN(missionItem.missionGimbalYaw)

2
src/QmlControls/MissionItemIndexLabel.qml

@ -25,7 +25,7 @@ Canvas { @@ -25,7 +25,7 @@ Canvas {
property real gimbalYaw
property real vehicleYaw
property bool showGimbalYaw: false
property bool showSequenceNumbers: false
property bool showSequenceNumbers: true
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)

Loading…
Cancel
Save