Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
1b77ef28
Commit
1b77ef28
authored
Nov 21, 2018
by
Don Gagne
Browse files
Fix double survey load from shape
parent
cf5a59b8
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/PlanView/PlanView.qml
View file @
1b77ef28
...
...
@@ -338,8 +338,13 @@ QGCView {
if
(
retList
[
0
]
==
ShapeFileHelper
.
Error
)
{
_qgcView
.
showMessage
(
"
Error
"
,
retList
[
1
],
StandardButton
.
Ok
)
}
else
if
(
retList
[
0
]
==
ShapeFileHelper
.
Polygon
)
{
polygonSelectPatternFile
=
file
_qgcView
.
showDialog
(
patternPolygonSelectDialog
,
fileDialog
.
title
,
_qgcView
.
showDialogDefaultWidth
,
StandardButton
.
Ok
|
StandardButton
.
Cancel
)
var
editVehicle
=
_activeVehicle
?
_activeVehicle
:
QGroundControl
.
multiVehicleManager
.
offlineEditingVehicle
if
(
editVehicle
.
fixedWing
)
{
insertComplexMissionItemFromKMLOrSHP
(
_missionController
.
surveyComplexItemName
,
file
,
-
1
)
}
else
{
polygonSelectPatternFile
=
file
_qgcView
.
showDialog
(
patternPolygonSelectDialog
,
fileDialog
.
title
,
_qgcView
.
showDialogDefaultWidth
,
StandardButton
.
Ok
|
StandardButton
.
Cancel
)
}
}
else
if
(
retList
[
0
]
==
ShapeFileHelper
.
Polyline
)
{
insertComplexMissionItemFromKMLOrSHP
(
_missionController
.
corridorScanComplexItemName
,
file
,
-
1
)
}
...
...
@@ -353,14 +358,6 @@ QGCView {
id
:
patternPolygonSelectDialog
QGCViewDialog
{
Component.onCompleted
:
{
var
editVehicle
=
_activeVehicle
?
_activeVehicle
:
QGroundControl
.
multiVehicleManager
.
offlineEditingVehicle
if
(
editVehicle
.
fixedWing
)
{
surveyRadio
.
checked
=
true
accept
()
}
}
function
accept
()
{
var
complexItemName
if
(
surveyRadio
.
checked
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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