From 034b658a53918829357a34e24a5c5382cbfad8b3 Mon Sep 17 00:00:00 2001 From: Gus Grubba Date: Tue, 30 Jul 2019 13:28:16 -0400 Subject: [PATCH] Fix logic deciding to show quick thermal options. --- custom-example/res/CustomCameraControl.qml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/custom-example/res/CustomCameraControl.qml b/custom-example/res/CustomCameraControl.qml index 431b875fc..37aeb1214 100644 --- a/custom-example/res/CustomCameraControl.qml +++ b/custom-example/res/CustomCameraControl.qml @@ -88,7 +88,7 @@ Item { id: backgroundRect width: buttonsRow.width + (ScreenTools.defaultFontPixelWidth * 4) 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 Component.onCompleted: { if(_irPaletteFact && QGroundControl.videoManager.hasThermal) { @@ -970,6 +970,10 @@ Item { spacing: ScreenTools.defaultFontPixelHeight anchors.margins: ScreenTools.defaultFontPixelHeight anchors.horizontalCenter: parent.horizontalCenter + QGCLabel { + text: qsTr("Thermal Palettes") + anchors.horizontalCenter: parent.horizontalCenter + } Repeater { model: _irPaletteFact ? _irPaletteFact.enumStrings : [] QGCButton { -- 2.22.0