Skip to content

Q
qgroundcontrol
Commit 034b658a authored by Gus Grubba's avatar Gus Grubba
Browse files
Options

Fix logic deciding to show quick thermal options.

parent e5eba4a9
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
custom-example/res/CustomCameraControl.qml
View file @ 034b658a
...@@ -88,7 +88,7 @@ Item { ...@@ -88,7 +88,7 @@ Item {
id: backgroundRect id: backgroundRect
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: _irPaletteFact && (QGroundControl.videoManager.hasThermal || _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) {
...@@ -970,6 +970,10 @@ Item { ...@@ -970,6 +970,10 @@ Item {
spacing: ScreenTools.defaultFontPixelHeight spacing: ScreenTools.defaultFontPixelHeight
anchors.margins: ScreenTools.defaultFontPixelHeight anchors.margins: ScreenTools.defaultFontPixelHeight
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
QGCLabel {
text: qsTr("Thermal Palettes")
anchors.horizontalCenter: parent.horizontalCenter
}
Repeater { Repeater {
model: _irPaletteFact ? _irPaletteFact.enumStrings : [] model: _irPaletteFact ? _irPaletteFact.enumStrings : []
QGCButton { QGCButton {
......
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