Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
628775ad
Commit
628775ad
authored
May 22, 2019
by
Gus Grubba
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Properly handle full thermal image display
parent
4d913127
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
FlightDisplayViewVideo.qml
src/FlightDisplay/FlightDisplayViewVideo.qml
+3
-3
No files found.
src/FlightDisplay/FlightDisplayViewVideo.qml
View file @
628775ad
...
...
@@ -34,7 +34,7 @@ Item {
property
bool
_hasZoom
:
_camera
&&
_camera
.
hasZoom
property
int
_fitMode
:
QGroundControl
.
settingsManager
.
videoSettings
.
videoFit
.
rawValue
property
double
_thermalHeightFactor
:
0.
666
//-- TODO
property
double
_thermalHeightFactor
:
0.
85
//-- TODO
Rectangle
{
id
:
noVideo
...
...
@@ -83,7 +83,7 @@ Item {
anchors.centerIn
:
parent
receiver
:
_videoReceiver
display
:
_videoReceiver
&&
_videoReceiver
.
videoSurface
visible
:
_videoReceiver
&&
_videoReceiver
.
videoRunning
visible
:
_videoReceiver
&&
_videoReceiver
.
videoRunning
&&
!
(
QGroundControl
.
videoManager
.
hasThermal
&&
_camera
.
thermalMode
===
QGCCameraControl
.
THERMAL_FULL
)
Connections
{
target
:
_videoReceiver
onImageFileChanged
:
{
...
...
@@ -127,7 +127,7 @@ Item {
Item
{
id
:
thermalItem
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
visible
:
QGroundControl
.
videoManager
.
hasThermal
&&
_camera
.
thermalMode
!==
QGCCameraControl
.
THERMAL_OFF
function
pipOrNot
()
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment