From 7e9e0be69880b9b4aa545e4b53704df185d01089 Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Tue, 25 Aug 2020 09:00:37 -0700 Subject: [PATCH 1/2] Remove flight speeds --- .../OfflineVehicleFirstRunPrompt.qml | 25 ---------------------- 1 file changed, 25 deletions(-) diff --git a/src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml b/src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml index 1b2fa38..4da593a 100644 --- a/src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml +++ b/src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml @@ -23,9 +23,6 @@ FirstRunPrompt { property real _margins: ScreenTools.defaultFontPixelWidth property var _appSettings: QGroundControl.settingsManager.appSettings - property var _offlineVehicle: QGroundControl.multiVehicleManager.offlineEditingVehicle - property bool _showCruiseSpeed: !_offlineVehicle.multiRotor - property bool _showHoverSpeed: _offlineVehicle.multiRotor || _offlineVehicle.vtol property bool _multipleFirmware: !QGroundControl.singleFirmwareSupport property bool _multipleVehicleTypes: !QGroundControl.singleVehicleSupport property real _fieldWidth: ScreenTools.defaultFontPixelWidth * 16 @@ -77,28 +74,6 @@ FirstRunPrompt { indexModel: false visible: _multipleVehicleTypes } - - QGCLabel { - Layout.fillWidth: true - text: qsTr("Mission Cruise Speed") - visible: _showCruiseSpeed - } - FactTextField { - Layout.preferredWidth: _fieldWidth - fact: QGroundControl.settingsManager.appSettings.offlineEditingCruiseSpeed - visible: _showCruiseSpeed - } - - QGCLabel { - Layout.fillWidth: true - text: qsTr("Mission Hover Speed") - visible: _showHoverSpeed - } - FactTextField { - Layout.preferredWidth: _fieldWidth - fact: QGroundControl.settingsManager.appSettings.offlineEditingHoverSpeed - visible: _showHoverSpeed - } } } } From d2609393c4bc8eca521f8580dba20ce54b83e513 Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Tue, 25 Aug 2020 09:00:51 -0700 Subject: [PATCH 2/2] Add note to help with confusion --- src/PlanView/MissionSettingsEditor.qml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/PlanView/MissionSettingsEditor.qml b/src/PlanView/MissionSettingsEditor.qml index e025eff..a11db59 100644 --- a/src/PlanView/MissionSettingsEditor.qml +++ b/src/PlanView/MissionSettingsEditor.qml @@ -221,6 +221,16 @@ Rectangle { } QGCLabel { + Layout.columnSpan: 2 + Layout.alignment: Qt.AlignHCenter + Layout.fillWidth: true + wrapMode: Text.WordWrap + font.pointSize: ScreenTools.smallFontPointSize + text: qsTr("The following speed values are used to calculate total mission time. They do not affect the flight speed for the mission.") + visible: _showCruiseSpeed || _showHoverSpeed + } + + QGCLabel { text: qsTr("Cruise speed") visible: _showCruiseSpeed Layout.fillWidth: true