From ade80bbec7cf27466f22c986c61d626f1cbbdc10 Mon Sep 17 00:00:00 2001 From: Stefan Dunca Date: Thu, 1 Aug 2019 19:13:34 +0200 Subject: [PATCH] custom-example: Fix gimbal view and special case for thermal options --- custom-example/res/CustomCameraControl.qml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/custom-example/res/CustomCameraControl.qml b/custom-example/res/CustomCameraControl.qml index c70a9a1a9..9c6324ec3 100644 --- a/custom-example/res/CustomCameraControl.qml +++ b/custom-example/res/CustomCameraControl.qml @@ -90,7 +90,7 @@ Item { id: thermalBackgroundRect width: buttonsRow.width + (ScreenTools.defaultFontPixelWidth * 4) 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 Component.onCompleted: { if(_irPaletteFact && QGroundControl.videoManager.hasThermal) { @@ -101,6 +101,8 @@ Item { if(_camera.thermalMode === QGCCameraControl.THERMAL_FULL) thermalFull.checked = true } + else + standardMode.checked = true } ButtonGroup { id: buttonGroup @@ -464,8 +466,11 @@ Item { } QGCLabel { id: gimbalLabel + width: gimbalCol.width color: qgcPal.text - font.pointSize: ScreenTools.smallFontPointSize + font.pointSize: ScreenTools.smallFontPointSize + text: activeVehicle ? activeVehicle.gimbalPitch.toFixed(0) : "-" + horizontalAlignment: Text.AlignHCenter } } } // Gimbal Indicator -- 2.22.0