Commit 0ac8e637 authored by Don Gagne's avatar Don Gagne

Merge pull request #1655 from DonLakeFlyer/RadioCal

Usability fixes:
parents f488360d df74f262
...@@ -236,6 +236,8 @@ QGCView { ...@@ -236,6 +236,8 @@ QGCView {
duration: 1500 duration: 1500
} }
/*
// FIXME: Bar animation is turned off for now to figure out better usbaility
onRcValueChanged: { onRcValueChanged: {
if (Math.abs(rcValue - __lastRcValue) > __rcValueMaxJitter) { if (Math.abs(rcValue - __lastRcValue) > __rcValueMaxJitter) {
__lastRcValue = rcValue __lastRcValue = rcValue
...@@ -243,7 +245,6 @@ QGCView { ...@@ -243,7 +245,6 @@ QGCView {
} }
} }
/*
// rcValue debugger // rcValue debugger
QGCLabel { QGCLabel {
anchors.fill: parent anchors.fill: parent
...@@ -427,7 +428,13 @@ QGCView { ...@@ -427,7 +428,13 @@ QGCView {
primary: true primary: true
text: "Calibrate" text: "Calibrate"
onClicked: showDialog(zeroTrimsDialogComponent, dialogTitle, 50, StandardButton.Ok | StandardButton.Cancel) onClicked: {
if (text == "Calibrate") {
showDialog(zeroTrimsDialogComponent, dialogTitle, 50, StandardButton.Ok | StandardButton.Cancel)
} else {
controller.nextButtonClicked()
}
}
} }
} // Row - Buttons } // Row - Buttons
...@@ -440,7 +447,14 @@ QGCView { ...@@ -440,7 +447,14 @@ QGCView {
Item { Item {
width: 10 width: 10
height: defaultTextHeight * 2 height: defaultTextHeight * 4
}
Rectangle {
width: parent.width
height: 1
border.color: qgcPal.text
border.width: 1
} }
QGCLabel { text: "Additional Radio setup:" } QGCLabel { text: "Additional Radio setup:" }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment