Browse Source

Fix logic deciding to show quick thermal options.

QGC4.4
Gus Grubba 6 years ago
parent
commit
034b658a53
  1. 6
      custom-example/res/CustomCameraControl.qml

6
custom-example/res/CustomCameraControl.qml

@ -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 {
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 {

Loading…
Cancel
Save