Skip to content
Snippets Groups Projects
Commit 1b77ef28 authored by Don Gagne's avatar Don Gagne
Browse files

Fix double survey load from shape
parent cf5a59b8
No related branches found
No related tags found
No related merge requests found
...@@ -338,8 +338,13 @@ QGCView { ...@@ -338,8 +338,13 @@ QGCView {
if (retList[0] == ShapeFileHelper.Error) { if (retList[0] == ShapeFileHelper.Error) {
_qgcView.showMessage("Error", retList[1], StandardButton.Ok) _qgcView.showMessage("Error", retList[1], StandardButton.Ok)
} else if (retList[0] == ShapeFileHelper.Polygon) { } else if (retList[0] == ShapeFileHelper.Polygon) {
var editVehicle = _activeVehicle ? _activeVehicle : QGroundControl.multiVehicleManager.offlineEditingVehicle
if (editVehicle.fixedWing) {
insertComplexMissionItemFromKMLOrSHP(_missionController.surveyComplexItemName, file, -1)
} else {
polygonSelectPatternFile = file polygonSelectPatternFile = file
_qgcView.showDialog(patternPolygonSelectDialog, fileDialog.title, _qgcView.showDialogDefaultWidth, StandardButton.Ok | StandardButton.Cancel) _qgcView.showDialog(patternPolygonSelectDialog, fileDialog.title, _qgcView.showDialogDefaultWidth, StandardButton.Ok | StandardButton.Cancel)
}
} else if (retList[0] == ShapeFileHelper.Polyline) { } else if (retList[0] == ShapeFileHelper.Polyline) {
insertComplexMissionItemFromKMLOrSHP(_missionController.corridorScanComplexItemName, file, -1) insertComplexMissionItemFromKMLOrSHP(_missionController.corridorScanComplexItemName, file, -1)
} }
...@@ -353,14 +358,6 @@ QGCView { ...@@ -353,14 +358,6 @@ QGCView {
id: patternPolygonSelectDialog id: patternPolygonSelectDialog
QGCViewDialog { QGCViewDialog {
Component.onCompleted: {
var editVehicle = _activeVehicle ? _activeVehicle : QGroundControl.multiVehicleManager.offlineEditingVehicle
if (editVehicle.fixedWing) {
surveyRadio.checked = true
accept()
}
}
function accept() { function accept() {
var complexItemName var complexItemName
if (surveyRadio.checked) { if (surveyRadio.checked) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment