From a50f27868989236542272a88a6490390d29e5763 Mon Sep 17 00:00:00 2001 From: Valentin Platzgummer Date: Mon, 28 Oct 2019 17:01:24 +0100 Subject: [PATCH] WimaMenu edited, upload progress bar added, guided action for override upload added. --- src/FlightDisplay/GuidedActionsController.qml | 2 +- src/Wima/WimaController.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/FlightDisplay/GuidedActionsController.qml b/src/FlightDisplay/GuidedActionsController.qml index 10427a08a..2261691bc 100644 --- a/src/FlightDisplay/GuidedActionsController.qml +++ b/src/FlightDisplay/GuidedActionsController.qml @@ -72,7 +72,7 @@ Item { readonly property string mvPauseMessage: qsTr("Pause all vehicles at their current position.") readonly property string vtolTransitionFwdMessage: qsTr("Transition VTOL to fixed wing flight.") readonly property string vtolTransitionMRMessage: qsTr("Transition VTOL to multi-rotor flight.") - readonly property string overrideUploadMessage: qsTr("Vehicle is not inside service area. Override upload lock?") + readonly property string overrideUploadMessage: qsTr("Vehicle is not inside service area. Upload nevertheless?") readonly property int actionRTL: 1 readonly property int actionLand: 2 diff --git a/src/Wima/WimaController.cc b/src/Wima/WimaController.cc index 2d705d3a7..df7db349d 100644 --- a/src/Wima/WimaController.cc +++ b/src/Wima/WimaController.cc @@ -185,8 +185,8 @@ void WimaController::resetPhase() bool WimaController::uploadToVehicle() { - if (!_serviceArea.containsCoordinate(_masterController->managerVehicle()->coordinate())) { - qgcApp()->showMessage(tr("Vehicle is not inside service area.")); + if ( !_serviceArea.containsCoordinate(_masterController->managerVehicle()->coordinate()) + && _currentMissionItems.count() > 0) { setUploadOverrideRequired(true); return false; } -- 2.22.0