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
c8e4878d
Commit
c8e4878d
authored
7 years ago
by
Jacob Walser
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Flight Display: refactor video recording status for readability
parent
6af4274d
master
dev1
merge_branch_alt
original
phil
rc1
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
6 deletions
+8
-6
FlightDisplayView.qml
src/FlightDisplay/FlightDisplayView.qml
+8
-6
No files found.
src/FlightDisplay/FlightDisplayView.qml
View file @
c8e4878d
...
...
@@ -44,6 +44,7 @@ QGCView {
property
var
_rallyPointController
:
_planMasterController
.
rallyPointController
property
var
_activeVehicle
:
QGroundControl
.
multiVehicleManager
.
activeVehicle
property
var
_videoReceiver
:
QGroundControl
.
videoManager
.
videoReceiver
property
bool
_recordingVideo
:
_videoReceiver
&&
_videoReceiver
.
recording
property
bool
_mainIsMap
:
QGroundControl
.
videoManager
.
hasVideo
?
QGroundControl
.
loadBoolGlobalSetting
(
_mainIsMapKey
,
true
)
:
true
property
bool
_isPipVisible
:
QGroundControl
.
videoManager
.
hasVideo
?
QGroundControl
.
loadBoolGlobalSetting
(
_PIPVisibleKey
,
true
)
:
false
property
real
_savedZoomLevel
:
0
...
...
@@ -381,11 +382,11 @@ QGCView {
anchors.top
:
parent
.
top
anchors.bottom
:
parent
.
bottom
width
:
height
radius
:
QGroundControl
.
videoManager
&&
_videoReceiver
&&
_videoReceiver
.
recording
?
0
:
height
radius
:
_recordingVideo
?
0
:
height
color
:
"
red
"
SequentialAnimation
on
visible
{
running
:
QGroundControl
.
videoManager
&&
QGroundControl
.
videoManager
.
videoReceiver
&&
QGroundControl
.
videoManager
.
videoReceiver
.
recording
running
:
_recordingVideo
loops
:
Animation
.
Infinite
PropertyAnimation
{
to
:
false
;
duration
:
1000
}
PropertyAnimation
{
to
:
true
;
duration
:
1000
}
...
...
@@ -407,12 +408,13 @@ QGCView {
MouseArea
{
anchors.fill
:
parent
onClicked
:
{
if
(
QGroundControl
.
videoManager
&&
QGroundControl
.
videoManager
.
videoReceiver
)
{
if
(
QGroundControl
.
videoManager
.
videoReceiver
.
recording
)
{
QGroundControl
.
videoManager
.
videoReceiver
.
stopRecording
()
if
(
_videoReceiver
)
{
if
(
_recordingVideo
)
{
_videoReceiver
.
stopRecording
()
// reset blinking animation
recordBtnBackground
.
visible
=
true
}
else
{
QGroundControl
.
videoManager
.
videoReceiver
.
startRecording
()
_
videoReceiver
.
startRecording
()
}
}
}
...
...
This diff is collapsed.
Click to expand it.
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