Unverified Commit 801b7e52 authored by Don Gagne's avatar Don Gagne Committed by GitHub

Merge pull request #9033 from DonLakeFlyer/MissionSpeeds

Mission speeds
parents 08cc9375 d2609393
......@@ -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
}
}
}
}
......
......@@ -220,6 +220,16 @@ Rectangle {
visible: _multipleVehicleTypes && !_noMissionItemsAdded
}
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
......
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