Skip to content

Q
qgroundcontrol
Unverified Commit 45c88c94 authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge pull request #8182 from DonLakeFlyer/FWLanding 

FW Landing visuals
parents 4fba7c63 fb394e51
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 33 deletions
src/PlanView/FWLandingPatternEditor.qml
View file @ 45c88c94
......@@ -215,14 +215,37 @@ Rectangle {
}
}
QGCLabel {
anchors.left: parent.left
anchors.right: parent.right
wrapMode: Text.WordWrap
color: qgcPal.warningText
font.pointSize: ScreenTools.smallFontPointSize
horizontalAlignment: Text.AlignHCenter
text: qsTr("* Glide slope altitudes are approximate. Actual flight path will vary due to environmental conditions and vehicle settings.")
Column {
anchors.left: parent.left
anchors.right: parent.right
spacing: 0
QGCLabel {
anchors.left: parent.left
anchors.right: parent.right
wrapMode: Text.WordWrap
color: qgcPal.warningText
font.pointSize: ScreenTools.smallFontPointSize
text: qsTr("* Approximate glide slope altitudes.")
}
QGCLabel {
anchors.left: parent.left
anchors.right: parent.right
wrapMode: Text.WordWrap
color: qgcPal.warningText
font.pointSize: ScreenTools.smallFontPointSize
text: qsTr("* Actual flight path will vary.")
}
QGCLabel {
anchors.left: parent.left
anchors.right: parent.right
wrapMode: Text.WordWrap
color: qgcPal.warningText
font.pointSize: ScreenTools.smallFontPointSize
text: qsTr("* Avoid tailwind on landing.")
}
}
}
......
src/PlanView/FWLandingPatternMapVisual.qml
View file @ 45c88c94
......@@ -256,7 +256,7 @@ Item {
sourceItem:
MissionItemIndexLabel {
index: _missionItem.sequenceNumber
label: "Loiter"
label: qsTr("Loiter")
checked: _missionItem.isCurrentItem
onClicked: _root.clicked(_missionItem.sequenceNumber)
......@@ -457,6 +457,7 @@ Item {
visible: _missionItem.isCurrentItem
sourceItem: HeightIndicator {
map: _root.map
heightText: Math.floor(QGroundControl.metersToAppSettingsDistanceUnits(_transitionAltitudeMeters)) +
QGroundControl.appSettingsDistanceUnitsString + "<sup>*</sup>"
}
......@@ -488,6 +489,7 @@ Item {
visible: _missionItem.isCurrentItem
sourceItem: HeightIndicator {
map: _root.map
heightText: Math.floor(QGroundControl.metersToAppSettingsDistanceUnits(_midSlopeAltitudeMeters)) +
QGroundControl.appSettingsDistanceUnitsString + "<sup>*</sup>"
}
......@@ -522,6 +524,7 @@ Item {
coordinate: _missionItem.loiterTangentCoordinate
sourceItem: HeightIndicator {
map: _root.map
heightText: _missionItem.loiterAltitude.value.toFixed(1) + QGroundControl.appSettingsDistanceUnitsString
}
}
......
src/QmlControls/HeightIndicator.qml
View file @ 45c88c94
......@@ -2,45 +2,51 @@ import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Layouts 1.11
import QGroundControl.ScreenTools 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.Palette 1.0
ColumnLayout {
spacing: 0
id: _root
spacing: 0
property color textColor: "white"
property var map
property string heightText: "30 ft"
property color _textColor: _mapPalette.text
QGCMapPalette { id: _mapPalette; lightColors: _root.map.isSatelliteMap }
Rectangle {
width: ScreenTools.defaultFontPixelWidth * 3
height: 1
color: textColor
Layout.alignment: Qt.AlignHCenter
width: ScreenTools.defaultFontPixelWidth * 3
height: 1
color: _textColor
Layout.alignment: Qt.AlignHCenter
}
Rectangle {
width: 1
height: ScreenTools.defaultFontPixelWidth * 1
color: textColor
Layout.alignment: Qt.AlignHCenter
width: 1
height: ScreenTools.defaultFontPixelWidth * 1
color: _textColor
Layout.alignment: Qt.AlignHCenter
}
QGCLabel {
text: heightText
color: textColor
Layout.alignment: Qt.AlignHCenter
QGCMapLabel {
map: _root.map
text: heightText
Layout.alignment: Qt.AlignHCenter
}
Rectangle {
width: 1
height: ScreenTools.defaultFontPixelWidth * 1
color: textColor
Layout.alignment: Qt.AlignHCenter
width: 1
height: ScreenTools.defaultFontPixelWidth * 1
color: _textColor
Layout.alignment: Qt.AlignHCenter
}
Rectangle {
width: ScreenTools.defaultFontPixelWidth * 3
height: 1
color: textColor
Layout.alignment: Qt.AlignHCenter
width: ScreenTools.defaultFontPixelWidth * 3
height: 1
color: _textColor
Layout.alignment: Qt.AlignHCenter
}
}
src/QmlControls/MissionItemIndexLabel.qml
View file @ 45c88c94
......@@ -92,7 +92,7 @@ Canvas {
anchors.left: indicator.right
anchors.top: indicator.top
anchors.bottom: indicator.bottom
color: "white"
color: "black"
text: _label
verticalAlignment: Text.AlignVCenter
visible: labelControl.visible
......
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