Skip to content

Q
qgroundcontrol
Unverified Commit ecbdc6de authored by Gus Grubba's avatar Gus Grubba Committed by GitHub
Browse files
Options

Merge pull request #7655 from stefandunca/pr-fixes 

custom-example: Fix gimbal view and an edge case for thermal options
parents f51c9f4b ade80bbe
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 2 deletions
custom-example/res/CustomCameraControl.qml
View file @ ecbdc6de
...@@ -90,7 +90,7 @@ Item { ...@@ -90,7 +90,7 @@ Item {
id: thermalBackgroundRect id: thermalBackgroundRect
width: buttonsRow.width + (ScreenTools.defaultFontPixelWidth * 4) width: buttonsRow.width + (ScreenTools.defaultFontPixelWidth * 4)
height: buttonsRow.height + (ScreenTools.defaultFontPixelHeight) height: buttonsRow.height + (ScreenTools.defaultFontPixelHeight)
visible: _irPaletteFact && (QGroundControl.videoManager.hasThermal || _camera.vendor === "NextVision") visible: QGroundControl.videoManager.hasThermal || _irPaletteFact || _camera.vendor === "NextVision"
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
Component.onCompleted: { Component.onCompleted: {
if(_irPaletteFact && QGroundControl.videoManager.hasThermal) { if(_irPaletteFact && QGroundControl.videoManager.hasThermal) {
...@@ -101,6 +101,8 @@ Item { ...@@ -101,6 +101,8 @@ Item {
if(_camera.thermalMode === QGCCameraControl.THERMAL_FULL) if(_camera.thermalMode === QGCCameraControl.THERMAL_FULL)
thermalFull.checked = true thermalFull.checked = true
} }
else
standardMode.checked = true
} }
ButtonGroup { ButtonGroup {
id: buttonGroup id: buttonGroup
...@@ -464,8 +466,11 @@ Item { ...@@ -464,8 +466,11 @@ Item {
} }
QGCLabel { QGCLabel {
id: gimbalLabel id: gimbalLabel
width: gimbalCol.width
color: qgcPal.text color: qgcPal.text
font.pointSize: ScreenTools.smallFontPointSize font.pointSize: ScreenTools.smallFontPointSize
text: activeVehicle ? activeVehicle.gimbalPitch.toFixed(0) : "-"
horizontalAlignment: Text.AlignHCenter
} }
} }
} // Gimbal Indicator } // Gimbal Indicator
......
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