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
7ae2f7a4
Commit
7ae2f7a4
authored
Jul 30, 2017
by
Don Gagne
Committed by
GitHub
Jul 30, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5486 from bluerobotics/pr-blink-record-btn
Make recording status more obvious
parents
5bdc2bf6
c8e4878d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
2 deletions
+24
-2
FlightDisplayView.qml
src/FlightDisplay/FlightDisplayView.qml
+24
-2
No files found.
src/FlightDisplay/FlightDisplayView.qml
View file @
7ae2f7a4
...
...
@@ -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
...
...
@@ -374,12 +375,22 @@ QGCView {
visible
:
_videoReceiver
&&
_videoReceiver
.
videoRunning
&&
QGroundControl
.
settingsManager
.
videoSettings
.
showRecControl
.
rawValue
opacity
:
0.75
readonly
property
string
recordBtnBackground
:
"
BackgroundName
"
Rectangle
{
id
:
recordBtnBackground
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
:
_recordingVideo
loops
:
Animation
.
Infinite
PropertyAnimation
{
to
:
false
;
duration
:
1000
}
PropertyAnimation
{
to
:
true
;
duration
:
1000
}
}
}
QGCColoredImage
{
...
...
@@ -389,13 +400,24 @@ QGCView {
width
:
height
*
0.625
sourceSize.width
:
width
source
:
"
/qmlimages/CameraIcon.svg
"
visible
:
recordBtnBackground
.
visible
fillMode
:
Image
.
PreserveAspectFit
color
:
"
white
"
}
MouseArea
{
anchors.fill
:
parent
onClicked
:
_videoReceiver
&&
_videoReceiver
.
recording
?
_videoReceiver
.
stopRecording
()
:
_videoReceiver
.
startRecording
()
onClicked
:
{
if
(
_videoReceiver
)
{
if
(
_recordingVideo
)
{
_videoReceiver
.
stopRecording
()
// reset blinking animation
recordBtnBackground
.
visible
=
true
}
else
{
_videoReceiver
.
startRecording
()
}
}
}
}
}
...
...
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