Commit 044f4cb2 authored by Don Gagne's avatar Don Gagne

Fix double load from KML

parent 8584c7af
......@@ -299,8 +299,13 @@ QGCView {
if (retList[0] == KMLFileHelper.Error) {
_qgcView.showMessage("Error", retList[1], StandardButton.Ok)
} else if (retList[0] == KMLFileHelper.Polygon) {
kmlPolygonSelectDialogKMLFile = file
_qgcView.showDialog(kmlPolygonSelectDialog, fileDialog.title, _qgcView.showDialogDefaultWidth, StandardButton.Ok | StandardButton.Cancel)
var editVehicle = _activeVehicle ? _activeVehicle : QGroundControl.multiVehicleManager.offlineEditingVehicle
if (editVehicle.fixedWing) {
insertComplexMissionItemFromKML(_missionController.surveyComplexItemName, file, -1)
} else {
kmlPolygonSelectDialogKMLFile = file
_qgcView.showDialog(kmlPolygonSelectDialog, fileDialog.title, _qgcView.showDialogDefaultWidth, StandardButton.Ok | StandardButton.Cancel)
}
} else if (retList[0] == KMLFileHelper.Polyline) {
insertComplexMissionItemFromKML(_missionController.corridorScanComplexItemName, file, -1)
}
......@@ -314,8 +319,6 @@ QGCView {
id: kmlPolygonSelectDialog
QGCViewDialog {
property var editVehicle: _activeVehicle ? _activeVehicle : QGroundControl.multiVehicleManager.offlineEditingVehicle
function accept() {
var complexItemName
if (surveyRadio.checked) {
......@@ -327,13 +330,6 @@ QGCView {
hideDialog()
}
Component.onCompleted: {
if (editVehicle.fixedWing) {
// Only Survey available
accept()
}
}
ExclusiveGroup {
id: radioGroup
}
......@@ -360,7 +356,6 @@ QGCView {
QGCRadioButton {
text: qsTr("Structure Scan")
exclusiveGroup: radioGroup
visible: !editVehicle.fixedWing
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment