Skip to content
GitLab
Commit a78fef59 authored by Don Gagne's avatar Don Gagne
Browse files

Latest UI design changes

parent 13d7b242
Hide whitespace changes
Inline Side-by-side
src/AutoPilotPlugins/PX4/SafetyComponent.qml
View file @ a78fef59
......@@ -5,6 +5,7 @@ import QtQuick.Controls.Styles 1.2
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.Controls 1.0
Rectangle {
QGCPalette { id: palette; colorGroupEnabled: true }
......@@ -12,123 +13,265 @@ Rectangle {
width: 600
height: 600
color: palette.window
property var leftColWidth: 350
property int flightLineWidth: 2 // width of lines for flight graphic
property int loiterAltitudeColumnWidth: 180 // width of loiter altitude column
property int shadedMargin: 20 // margin inset for shaded areas
property int controlVerticalSpacing: 10 // vertical spacing between controls
property int homeWidth: 50 // width of home graphic
property int planeWidth: 40 // width of plane graphic
property int arrowToHomeSpacing: 20 // space between down arrow and home graphic
property int arrowWidth: 18 // width for arrow graphic
property int firstColumnWidth: 220 // Width of first column in return home triggers area
Column {
anchors.fill: parent
spacing: 40
QGCLabel {
text: "SAFETY CONFIG"
font.pointSize: 20
}
Item { height: 20; width: 10 } // spacer
//-----------------------------------------------------------------
//-- Return Home Triggers
Column {
spacing: 18
Label { text: "Triggers For Return Home"; color: palette.text; font.pointSize: 20 }
Row {
Label {
width: leftColWidth
text: "RC Transmitter Signal Loss - Return Home After"
color: palette.text
anchors.baseline: rcLossField.baseline
}
FactTextField {
id: rcLossField
fact: autopilot.parameters["COM_RC_LOSS_T"]
showUnits: true
}
}
Row {
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
QGCLabel { text: "Triggers For Return Home"; color: palette.text; font.pointSize: 20 }
Item { height: 10; width: 10 } // spacer
Rectangle {
width: parent.width
height: triggerColumn.height
color: palette.windowShade
Column {
id: triggerColumn
spacing: controlVerticalSpacing
anchors.margins: shadedMargin
anchors.left: parent.left
// Top margin
Item { height: 1; width: 10 }
Row {
spacing: 10
QGCLabel { text: "RC Transmitter Signal Loss"; width: firstColumnWidth; anchors.baseline: rcLossField.baseline }
QGCLabel { text: "Return Home after"; anchors.baseline: rcLossField.baseline }
FactTextField {
id: rcLossField
fact: autopilot.parameters["COM_RC_LOSS_T"]
showUnits: true
}
}
FactTextField {
id: telemetryLossField
fact: autopilot.parameters["COM_DL_LOSS_T"];
showUnits: true
Row {
spacing: 10
FactCheckBox {
fact: autopilot.parameters["COM_DL_LOSS_EN"]
checkedValue: 1
uncheckedValue: 0
text: "Telemetry Signal Timeout"
anchors.baseline: telemetryLossField.baseline
width: firstColumnWidth
}
QGCLabel { text: "Return Home after"; anchors.baseline: telemetryLossField.baseline }
FactTextField {
id: telemetryLossField
fact: autopilot.parameters["COM_DL_LOSS_T"];
showUnits: true
}
}
// Bottom margin
Item { height: 1; width: 10 }
}
}
Item { height: 20; width: 10 } // spacer
//-----------------------------------------------------------------
//-- Return Home Options
Column {
spacing: 18
Label { text: "Return Home Options"; color: palette.text; font.pointSize: 20 }
Row {
Label {
width: leftColWidth
text: "Climb to minimum altitude of "
color: palette.text
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
//-- Return Home Settings
QGCLabel { text: "Return Home Settings"; font.pointSize: 20 }
Item { height: 10; width: 10 } // spacer
Rectangle {
width: parent.width
height: settingsColumn.height
color: palette.windowShade
Column {
id: settingsColumn
width: parent.width
anchors.margins: shadedMargin
anchors.left: parent.left
Item { height: shadedMargin; width: 10 } // top margin
// This item is the holder for the climb alt and loiter seconds fields
Item {
width: parent.width
height: climbAltitudeColumn.height
Column {
id: climbAltitudeColumn
spacing: controlVerticalSpacing
QGCLabel { text: "Climb to altitude of" }
FactTextField {
id: climbField
fact: autopilot.parameters["RTL_RETURN_ALT"]
showUnits: true
}
}
style: CheckBoxStyle {
label: Text {
color: palette.text
text: control.text
Column {
x: flightGraphic.width - 200
spacing: controlVerticalSpacing
QGCCheckBox {
id: homeLoiterCheckbox
property Fact fact: autopilot.parameters["RTL_LAND_DELAY"]
checked: fact.value > 0
text: "Loiter at Home altitude for"
onClicked: {
fact.value = checked ? 60 : -1
}
}
FactTextField {
fact: autopilot.parameters["RTL_LAND_DELAY"];
showUnits: true
enabled: homeLoiterCheckbox.checked == true
}
}
}
FactTextField {
fact: autopilot.parameters["RTL_LAND_DELAY"];
showUnits: true
anchors.baseline: homeLoiterCheckbox.baseline
enabled: homeLoiterCheckbox.checked == true
}
}
//-------------------------------------------------------------
//-- 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 {
Label {
width: leftColWidth;
text: "When Home is reached, loiter at an altitude of ";
color: palette.text;
anchors.baseline: descendField.baseline
visible: homeLoiterCheckbox.checked == true
}
FactTextField {
id: descendField;
fact: autopilot.parameters["RTL_DESCEND_ALT"];
visible: homeLoiterCheckbox.checked == true
showUnits: true
Item { height: 20; width: 10 } // spacer
// This row holds the flight graphic and the home loiter alt column
Row {
width: parent.width
spacing: 20
// Flight graphic
Item {
id: flightGraphic
width: parent.width - loiterAltitudeColumnWidth
height: 200 // controls the height of the flight graphic
Rectangle {
x: planeWidth / 2
height: planeImage.y - 5
width: flightLineWidth
color: palette.button
}
Rectangle {
x: planeWidth / 2
height: flightLineWidth
width: parent.width - x
color: palette.button
}
Rectangle {
x: parent.width - flightLineWidth
height: parent.height - homeWidth - arrowToHomeSpacing
width: flightLineWidth
color: palette.button
}
QGCColoredImage {
id: planeImage
y: parent.height - planeWidth - 40
source: "/qml/SafetyComponentPlane.png"
fillMode: Image.PreserveAspectFit
width: planeWidth
height: planeWidth
smooth: true
color: palette.button
}
QGCColoredImage {
x: planeWidth + 70
y: parent.height - height - 20
width: 80
height: parent.height / 2
source: "/qml/SafetyComponentTree.png"
fillMode: Image.Stretch
smooth: true
color: palette.windowShadeDark
}
QGCColoredImage {
x: planeWidth + 15
y: parent.height - height
width: 100
height: parent.height * .75
source: "/qml/SafetyComponentTree.png"
fillMode: Image.Stretch
smooth: true
color: palette.button
}
QGCColoredImage {
x: parent.width - (arrowWidth/2) - 1
y: parent.height - homeWidth - arrowToHomeSpacing - 2
source: "/qml/SafetyComponentArrowDown.png"
fillMode: Image.PreserveAspectFit
width: arrowWidth
height: arrowWidth
smooth: true
color: palette.button
}
QGCColoredImage {
id: homeImage
x: parent.width - (homeWidth / 2)
y: parent.height - homeWidth
source: "/qml/SafetyComponentHome.png"
fillMode: Image.PreserveAspectFit
width: homeWidth
height: homeWidth
smooth: true
color: palette.button
}
}
Column {
spacing: controlVerticalSpacing
QGCLabel {
text: "Home loiter altitude";
color: palette.text;
enabled: homeLoiterCheckbox.checked == true
}
FactTextField {
id: descendField;
fact: autopilot.parameters["RTL_DESCEND_ALT"];
enabled: homeLoiterCheckbox.checked == true
showUnits: true
}
}
}
Item { height: shadedMargin; width: 10 } // bottom margin
}
}
Text {
QGCLabel {
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 != 0
color: palette.text
wrapMode: Text.Wrap
}
Text {
QGCLabel {
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 != 0
color: palette.text
wrapMode: Text.Wrap
}
}
......
Supports Markdown
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