Skip to content

Q
qgroundcontrol
Commit 8ccf64f0 authored by Don Gagne's avatar Don Gagne
Browse files
Options

Merge pull request #2506 from DonLakeFlyer/MountMode 

Add MNT_DEFLT_MODE combo
parents 848b864d ae96582d
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 20 deletions
src/AutoPilotPlugins/APM/APMCameraComponent.qml
View file @ 8ccf64f0
...@@ -68,8 +68,6 @@ QGCView { ...@@ -68,8 +68,6 @@ QGCView {
property Fact _mountAngMinPan: controller.getParameterFact(-1, "MNT_ANGMIN_PAN") property Fact _mountAngMinPan: controller.getParameterFact(-1, "MNT_ANGMIN_PAN")
property Fact _mountAngMaxPan: controller.getParameterFact(-1, "MNT_ANGMAX_PAN") property Fact _mountAngMaxPan: controller.getParameterFact(-1, "MNT_ANGMAX_PAN")
// FIXME: WHat do we set this to? APM Planner sets to RC Tracking whenever a value is changed.
// Check default iris settings.
property Fact _mountDefaultMode: controller.getParameterFact(-1, "MNT_DEFLT_MODE") property Fact _mountDefaultMode: controller.getParameterFact(-1, "MNT_DEFLT_MODE")
property Fact _mountType: controller.getParameterFact(-1, "MNT_TYPE") property Fact _mountType: controller.getParameterFact(-1, "MNT_TYPE")
...@@ -391,7 +389,7 @@ QGCView { ...@@ -391,7 +389,7 @@ QGCView {
clip: true clip: true
anchors.fill: parent anchors.fill: parent
contentHeight: gimbalDirectionPanLoader.y + gimbalDirectionPanLoader.height contentHeight: gimbalDirectionPanLoader.y + gimbalDirectionPanLoader.height
contentWidth: gimbalTypeRectangle.x + gimbalTypeRectangle.width contentWidth: settingsRectangle.x + settingsRectangle.width
Loader { Loader {
id: gimbalDirectionTiltLoader id: gimbalDirectionTiltLoader
...@@ -449,40 +447,68 @@ QGCView { ...@@ -449,40 +447,68 @@ QGCView {
} }
QGCLabel { QGCLabel {
id: typeLabel id: settingsLabel
anchors.leftMargin: _margins anchors.leftMargin: _margins
anchors.left: gimbalDirectionTiltLoader.right anchors.left: gimbalDirectionTiltLoader.right
text: "Gimbal Type" text: "Gimbal Settings"
font.weight: Font.DemiBold font.weight: Font.DemiBold
} }
Rectangle { Rectangle {
id: gimbalTypeRectangle id: settingsRectangle
anchors.topMargin: _margins / 2 anchors.topMargin: _margins / 2
anchors.left: typeLabel.left anchors.left: settingsLabel.left
anchors.top: typeLabel.bottom anchors.top: settingsLabel.bottom
width: rebootLabel.x + rebootLabel.width + _margins width: gimbalModeCombo.x + gimbalModeCombo.width + _margins
height: rebootLabel.y + rebootLabel.height + _margins height: gimbalModeCombo.y + gimbalModeCombo.height + _margins
color: palette.windowShade color: palette.windowShade
QGCLabel {
id: gimbalTypeLabel
anchors.margins: _margins
anchors.left: parent.left
anchors.baseline: gimbalTypeCombo.baseline
text: "Type:"
}
FactComboBox { FactComboBox {
id: gimbalTypeCombo id: gimbalTypeCombo
anchors.margins: _margins anchors.topMargin: _margins
anchors.top: parent.top anchors.top: parent.top
anchors.left: parent.left anchors.left: gimbalModeCombo.left
width: ScreenTools.defaultFontPixelWidth * 15 width: gimbalModeCombo.width
fact: _mountType fact: _mountType
indexModel: false indexModel: false
} }
QGCLabel { QGCLabel {
id: rebootLabel id: rebootLabel
anchors.topMargin: _margins / 2 anchors.topMargin: _margins / 2
anchors.left: gimbalTypeCombo.left anchors.leftMargin: _margins
anchors.top: gimbalTypeCombo.bottom anchors.rightMargin: _margins
width: ScreenTools.defaultFontPixelWidth * 25 anchors.left: parent.left
wrapMode: Text.WordWrap anchors.right: parent.right
text: "Gimbal Type changes takes affect next reboot of autopilot" anchors.top: gimbalTypeCombo.bottom
wrapMode: Text.WordWrap
text: "Gimbal Type changes takes affect next reboot of autopilot"
}
QGCLabel {
id: gimbalModeLabel
anchors.margins: _margins
anchors.left: parent.left
anchors.baseline: gimbalModeCombo.baseline
text: "Default Mode:"
}
FactComboBox {
id: gimbalModeCombo
anchors.margins: _margins
anchors.top: rebootLabel.bottom
anchors.left: gimbalModeLabel.right
width: ScreenTools.defaultFontPixelWidth * 15
fact: _mountDefaultMode
indexModel: false
} }
} }
} // Flickable } // Flickable
......
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