Skip to content

fix(GimbalIndicator): prevent angle text jittering in toolbar #14663

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
DonLakeFlyer wants to merge 1 commit into from
Closed

fix(GimbalIndicator): prevent angle text jittering in toolbar #14663

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 38 additions & 12 deletions src/Toolbar/GimbalIndicator.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,30 @@ Item {
rowSpacing: 0
columnSpacing: margins / 2

// Round to whole degrees and normalize -0 to 0 to prevent the text from
// jittering around as the gimbal telemetry noise changes the value slightly.
function formatAngle(fact) {
var angle = Math.round(fact.rawValue)
return isNaN(angle) ? "--" : (angle + 0).toString()
}

// The labels are fixed to the width of the widest possible value so the
// toolbar doesn't shift as the digit count changes. "-188" is used since
// 8 is the widest digit.
TextMetrics {
id: pitchTextMetrics
font.family: pitchLabel.font.family
font.pointSize: ScreenTools.smallFontPointSize
text: qsTr("P: ") + "-188"
}

TextMetrics {
id: panTextMetrics
font.family: panLabel.font.family
font.pointSize: ScreenTools.smallFontPointSize
text: (showAzimuth ? qsTr("Az: ") : qsTr("Y: ")) + "-188"
}

QGCLabel {
id: statusLabel
font.pointSize: ScreenTools.smallFontPointSize
Expand All @@ -86,20 +110,22 @@ Item {
Layout.alignment: Qt.AlignHCenter
}
QGCLabel {
id: pitchLabel
font.pointSize: ScreenTools.smallFontPointSize
text: activeGimbal ? qsTr("P: ") + activeGimbal.absolutePitch.valueString : ""
color: qgcPal.text
id: pitchLabel
font.pointSize: ScreenTools.smallFontPointSize
text: activeGimbal ? qsTr("P: ") + parent.formatAngle(activeGimbal.absolutePitch) : ""
color: qgcPal.text
Layout.preferredWidth: pitchTextMetrics.width
}
QGCLabel {
id: panLabel
font.pointSize: ScreenTools.smallFontPointSize
text: activeGimbal ?
(showAzimuth ?
(qsTr("Az: ") + activeGimbal.absoluteYaw.valueString) :
(qsTr("Y: ") + activeGimbal.bodyYaw.valueString)) :
""
color: qgcPal.text
id: panLabel
font.pointSize: ScreenTools.smallFontPointSize
text: activeGimbal ?
(showAzimuth ?
(qsTr("Az: ") + parent.formatAngle(activeGimbal.absoluteYaw)) :
(qsTr("Y: ") + parent.formatAngle(activeGimbal.bodyYaw))) :
""
color: qgcPal.text
Layout.preferredWidth: panTextMetrics.width
}
}
}
Expand Down
Loading