Browse Source

Properly handle full thermal image display

QGC4.4
Gus Grubba 6 years ago
parent
commit
628775adae
  1. 6
      src/FlightDisplay/FlightDisplayViewVideo.qml

6
src/FlightDisplay/FlightDisplayViewVideo.qml

@ -34,7 +34,7 @@ Item {
property bool _hasZoom: _camera && _camera.hasZoom property bool _hasZoom: _camera && _camera.hasZoom
property int _fitMode: QGroundControl.settingsManager.videoSettings.videoFit.rawValue property int _fitMode: QGroundControl.settingsManager.videoSettings.videoFit.rawValue
property double _thermalHeightFactor: 0.666 //-- TODO property double _thermalHeightFactor: 0.85 //-- TODO
Rectangle { Rectangle {
id: noVideo id: noVideo
@ -83,7 +83,7 @@ Item {
anchors.centerIn: parent anchors.centerIn: parent
receiver: _videoReceiver receiver: _videoReceiver
display: _videoReceiver && _videoReceiver.videoSurface display: _videoReceiver && _videoReceiver.videoSurface
visible: _videoReceiver && _videoReceiver.videoRunning visible: _videoReceiver && _videoReceiver.videoRunning && !(QGroundControl.videoManager.hasThermal && _camera.thermalMode === QGCCameraControl.THERMAL_FULL)
Connections { Connections {
target: _videoReceiver target: _videoReceiver
onImageFileChanged: { onImageFileChanged: {
@ -127,7 +127,7 @@ Item {
Item { Item {
id: thermalItem id: thermalItem
width: height * QGroundControl.videoManager.thermalAspectRatio width: height * QGroundControl.videoManager.thermalAspectRatio
height: _camera ? (_camera.thermalMode === QGCCameraControl.THERMAL_PIP ? ScreenTools.defaultFontPixelHeight * 12 : parent.height * _thermalHeightFactor) : 0 height: _camera ? (_camera.thermalMode === QGCCameraControl.THERMAL_FULL ? parent.height : (_camera.thermalMode === QGCCameraControl.THERMAL_PIP ? ScreenTools.defaultFontPixelHeight * 12 : parent.height * _thermalHeightFactor)) : 0
anchors.centerIn: parent anchors.centerIn: parent
visible: QGroundControl.videoManager.hasThermal && _camera.thermalMode !== QGCCameraControl.THERMAL_OFF visible: QGroundControl.videoManager.hasThermal && _camera.thermalMode !== QGCCameraControl.THERMAL_OFF
function pipOrNot() { function pipOrNot() {

Loading…
Cancel
Save