Browse Source

Merge pull request #9033 from DonLakeFlyer/MissionSpeeds

Mission speeds
QGC4.4
Don Gagne 5 years ago committed by GitHub
parent
commit
801b7e52a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 25
      src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml
  2. 10
      src/PlanView/MissionSettingsEditor.qml

25
src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml

@ -23,9 +23,6 @@ FirstRunPrompt { @@ -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 { @@ -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
}
}
}
}

10
src/PlanView/MissionSettingsEditor.qml

@ -221,6 +221,16 @@ Rectangle { @@ -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

Loading…
Cancel
Save