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
ccd91f7a
Commit
ccd91f7a
authored
Apr 14, 2017
by
Don Gagne
Committed by
GitHub
Apr 14, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4981 from DonLakeFlyer/UploadWhileMission
New user model for upload while actively flying a mission
parents
f57e0f3d
4d868b9f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
41 additions
and
5 deletions
+41
-5
PlanView.qml
src/PlanView/PlanView.qml
+41
-5
No files found.
src/PlanView/PlanView.qml
View file @
ccd91f7a
...
...
@@ -115,6 +115,40 @@ QGCView {
}
}
Component
{
id
:
activeMissionUploadDialogComponent
QGCViewDialog
{
Column
{
anchors.fill
:
parent
spacing
:
ScreenTools
.
defaultFontPixelHeight
QGCLabel
{
width
:
parent
.
width
wrapMode
:
Text
.
WordWrap
text
:
qsTr
(
"
Your vehicle is currently flying a mission. In order to upload a new or modified mission the current mission will be paused.
"
)
}
QGCLabel
{
width
:
parent
.
width
wrapMode
:
Text
.
WordWrap
text
:
qsTr
(
"
After the mission is uploaded you can adjust the current waypoint and start the mission.
"
)
}
QGCButton
{
text
:
qsTr
(
"
Pause and Upload
"
)
onClicked
:
{
_activeVehicle
.
flightMode
=
_activeVehicle
.
pauseFlightMode
missionController
.
sendToVehicle
()
toolbar
.
showFlyView
()
hideDialog
()
}
}
}
}
}
MissionController
{
id
:
missionController
...
...
@@ -127,7 +161,7 @@ QGCView {
function
_denyUpload
()
{
if
(
_activeVehicle
&&
_activeVehicle
.
armed
&&
_activeVehicle
.
flightMode
===
_activeVehicle
.
missionFlightMode
)
{
_qgcView
.
show
Message
(
qsTr
(
"
Mission Upload
"
),
qsTr
(
"
Your vehicle is currently flying a mission. Upload is not allowed.
"
),
StandardButton
.
Ok
)
_qgcView
.
show
Dialog
(
activeMissionUploadDialogComponent
,
qsTr
(
"
Mission Upload
"
),
_qgcView
.
showDialogDefaultWidth
,
StandardButton
.
Cancel
)
return
true
}
else
{
return
false
...
...
@@ -137,7 +171,9 @@ QGCView {
// Users is switching away from Plan View
function
uploadOnSwitch
()
{
if
(
missionController
.
dirty
&&
_autoSync
)
{
if
(
!
_denyUpload
())
{
if
(
_denyUpload
())
{
return
false
}
else
{
sendToVehicle
()
}
}
...
...
@@ -145,9 +181,9 @@ QGCView {
}
function
upload
()
{
if
(
!
_denyUpload
())
{
sendToVehicle
()
}
if
(
!
_denyUpload
())
{
sendToVehicle
()
}
}
function
loadFromSelectedFile
()
{
...
...
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