Skip to content

Q
qgroundcontrol
Commit ea6c6a91 authored by dogmaphobic's avatar dogmaphobic
Browse files
Options

Reworking the layout of the "Return Home" Safety Dialog.

parent c152d257
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 32 deletions
src/AutoPilotPlugins/PX4/SafetyComponent.qml
View file @ ea6c6a91
......@@ -10,35 +10,74 @@ Rectangle {
width: 600
height: 400
color: palette.window
property var leftColWidth: 350
Column {
anchors.fill: parent
spacing: 20
spacing: 40
//-----------------------------------------------------------------
//-- Return Home Triggers
Column {
spacing: 10
Label { text: "Return to Land setup"; color: palette.windowText; font.pointSize: 20 }
spacing: 18
Label { text: "Triggers For Return Home"; color: palette.windowText; font.pointSize: 20 }
Row {
Label { text: "Climb to minimum altitude of "; color: palette.windowText; anchors.baseline: climbField.baseline }
FactTextField { id: climbField; fact: autopilot.parameters["RTL_RETURN_ALT"]; showUnits: true }
FactCheckBox {
id: telemetryLossCheckbox
fact: autopilot.parameters["COM_DL_LOSS_EN"]
width: leftColWidth
checkedValue: 1
uncheckedValue: 0
text: "Telemetry signal timeout - Return Home After"
anchors.baseline: telemetryLossField.baseline
}
FactTextField {
id: telemetryLossField
fact: autopilot.parameters["NAV_DLL_N"];
showUnits: true
}
}
Row {
Label { text: "When Home is reached, descend to altitude of "; color: palette.windowText; anchors.baseline: descendField.baseline }
FactTextField { id: descendField; fact: autopilot.parameters["RTL_DESCEND_ALT"]; showUnits: true }
Label {
width: leftColWidth
text: "RC Transmitter signal loss - Return Home After"
color: palette.windowText
anchors.baseline: rcLossField.baseline
}
FactTextField {
id: rcLossField
fact: autopilot.parameters["COM_RC_LOSS_T"]
showUnits: true
}
}
}
//-----------------------------------------------------------------
//-- Return Home Options
Column {
spacing: 18
Label { text: "Return Home Options"; color: palette.windowText; font.pointSize: 20 }
Row {
Label {
width: leftColWidth
text: "Climb to minimum altitude of "
color: palette.windowText
anchors.baseline: climbField.baseline
}
FactTextField {
id: climbField
fact: autopilot.parameters["RTL_RETURN_ALT"]
showUnits: true
}
}
Row {
CheckBox {
id: homeLoiterCheckbox
property Fact fact: autopilot.parameters["RTL_LAND_DELAY"]
width: leftColWidth
checked: fact.value > 0
text: "Loiter at Home altitude for "
onClicked: {
fact.value = checked ? 60 : -1
}
style: CheckBoxStyle {
label: Text {
color: palette.windowText
......@@ -50,38 +89,33 @@ Rectangle {
fact: autopilot.parameters["RTL_LAND_DELAY"];
showUnits: true
anchors.baseline: homeLoiterCheckbox.baseline
enabled: homeLoiterCheckbox.checked == true
}
}
}
Column {
spacing: 10
Label { text: "Return to Land Triggers"; color: palette.windowText; font.pointSize: 20 }
//-------------------------------------------------------------
//-- Visible only if loiter above is checked
// TODO The "enabled" property could be used instead but it
// would have to handle a different "disabled" palette.
Row {
FactCheckBox {
id: telemetryLossCheckbox
fact: autopilot.parameters["COM_DL_LOSS_EN"]
checkedValue: 1
uncheckedValue: 0
text: "Telemetry signal timeout - Return to Land"
anchors.baseline: telemetryLossField.baseline
Label {
width: leftColWidth;
text: "When Home is reached, loiter at an altitude of ";
color: palette.windowText;
anchors.baseline: descendField.baseline
visible: homeLoiterCheckbox.checked == true
}
Label { text: " after "; color: palette.windowText; anchors.baseline: telemetryLossField.baseline }
FactTextField {
id: telemetryLossField
fact: autopilot.parameters["NAV_DLL_N"];
id: descendField;
fact: autopilot.parameters["RTL_DESCEND_ALT"];
visible: homeLoiterCheckbox.checked == true
showUnits: true
}
}
Row {
Label { text: "RC Transmitter signal loss - Return to Land after "; color: palette.windowText; anchors.baseline: rcLossField.baseline }
FactTextField { id: rcLossField; fact: autopilot.parameters["COM_RC_LOSS_T"]; showUnits: true }
}
}
Text {
width: parent.width
font.pointSize: 14
text: "Warning: You have an advanced safety configuration set using the NAV_RCL_OBC parameter. The above settings may not apply.";
visible: autopilot.parameters["NAV_RCL_OBC"].value == 1
color: palette.windowText
......@@ -89,6 +123,7 @@ Rectangle {
}
Text {
width: parent.width
font.pointSize: 14
text: "Warning: You have an advanced safety configuration set using the NAV_DLL_OBC parameter. The above settings may not apply.";
visible: autopilot.parameters["NAV_DLL_OBC"].value == 1
color: palette.windowText
......
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