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
dccfcc1f
Unverified
Commit
dccfcc1f
authored
Feb 22, 2020
by
Don Gagne
Committed by
GitHub
Feb 22, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8389 from dakejahl/pr-show_checklist_if_needed
Show checklist if needed
parents
47390a71
4a637d90
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
6 deletions
+10
-6
FlightDisplayView.qml
src/FlightDisplay/FlightDisplayView.qml
+6
-6
MainRootWindow.qml
src/ui/MainRootWindow.qml
+4
-0
No files found.
src/FlightDisplay/FlightDisplayView.qml
View file @
dccfcc1f
...
...
@@ -70,12 +70,6 @@ Item {
readonly
property
string
_mainIsMapKey
:
"
MainFlyWindowIsMap
"
readonly
property
string
_PIPVisibleKey
:
"
IsPIPVisible
"
onVisibleChanged
:
{
if
(
activeVehicle
&&
!
_checklistComplete
&&
_enforceChecklist
)
{
checklistPopupTimer
.
restart
()
}
}
Timer
{
id
:
checklistPopupTimer
interval
:
1000
...
...
@@ -122,6 +116,12 @@ Item {
return
true
;
}
function
showPreflightChecklistIfNeeded
()
{
if
(
activeVehicle
&&
!
_checklistComplete
&&
_enforceChecklist
)
{
checklistPopupTimer
.
restart
()
}
}
Connections
{
target
:
_missionController
onResumeMissionUploadFail
:
guidedActionsController
.
confirmAction
(
guidedActionsController
.
actionResumeMissionUploadFail
)
...
...
src/ui/MainRootWindow.qml
View file @
dccfcc1f
...
...
@@ -113,6 +113,10 @@ ApplicationWindow {
}
function
showFlyView
()
{
if
(
!
flightView
.
visible
)
{
flightView
.
showPreflightChecklistIfNeeded
()
}
viewSwitch
(
false
)
flightView
.
visible
=
true
}
...
...
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