Skip to content

Q
qgroundcontrol
Commit bf956096 authored by DonLakeFlyer's avatar DonLakeFlyer
Browse files
Options

parent d5f7442e
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 23 deletions
src/PlanView/FWLandingPatternMapVisual.qml
View file @ bf956096
...@@ -457,6 +457,7 @@ Item { ...@@ -457,6 +457,7 @@ Item {
visible: _missionItem.isCurrentItem visible: _missionItem.isCurrentItem
sourceItem: HeightIndicator { sourceItem: HeightIndicator {
map: _root.map
heightText: Math.floor(QGroundControl.metersToAppSettingsDistanceUnits(_transitionAltitudeMeters)) + heightText: Math.floor(QGroundControl.metersToAppSettingsDistanceUnits(_transitionAltitudeMeters)) +
QGroundControl.appSettingsDistanceUnitsString + "<sup>*</sup>" QGroundControl.appSettingsDistanceUnitsString + "<sup>*</sup>"
} }
...@@ -488,6 +489,7 @@ Item { ...@@ -488,6 +489,7 @@ Item {
visible: _missionItem.isCurrentItem visible: _missionItem.isCurrentItem
sourceItem: HeightIndicator { sourceItem: HeightIndicator {
map: _root.map
heightText: Math.floor(QGroundControl.metersToAppSettingsDistanceUnits(_midSlopeAltitudeMeters)) + heightText: Math.floor(QGroundControl.metersToAppSettingsDistanceUnits(_midSlopeAltitudeMeters)) +
QGroundControl.appSettingsDistanceUnitsString + "<sup>*</sup>" QGroundControl.appSettingsDistanceUnitsString + "<sup>*</sup>"
} }
...@@ -522,6 +524,7 @@ Item { ...@@ -522,6 +524,7 @@ Item {
coordinate: _missionItem.loiterTangentCoordinate coordinate: _missionItem.loiterTangentCoordinate
sourceItem: HeightIndicator { sourceItem: HeightIndicator {
map: _root.map
heightText: _missionItem.loiterAltitude.value.toFixed(1) + QGroundControl.appSettingsDistanceUnitsString heightText: _missionItem.loiterAltitude.value.toFixed(1) + QGroundControl.appSettingsDistanceUnitsString
} }
} }
......
src/QmlControls/HeightIndicator.qml
View file @ bf956096
...@@ -2,45 +2,51 @@ import QtQuick 2.3 ...@@ -2,45 +2,51 @@ import QtQuick 2.3
import QtQuick.Controls 1.2 import QtQuick.Controls 1.2
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.11
import QGroundControl.ScreenTools 1.0 import QGroundControl.ScreenTools 1.0
import QGroundControl.Palette 1.0
ColumnLayout { ColumnLayout {
spacing: 0 id: _root
spacing: 0
property color textColor: "white" property var map
property string heightText: "30 ft" property string heightText: "30 ft"
property color _textColor: _mapPalette.text
QGCMapPalette { id: _mapPalette; lightColors: _root.map.isSatelliteMap }
Rectangle { Rectangle {
width: ScreenTools.defaultFontPixelWidth * 3 width: ScreenTools.defaultFontPixelWidth * 3
height: 1 height: 1
color: textColor color: _textColor
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
} }
Rectangle { Rectangle {
width: 1 width: 1
height: ScreenTools.defaultFontPixelWidth * 1 height: ScreenTools.defaultFontPixelWidth * 1
color: textColor color: _textColor
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
} }
QGCLabel { QGCMapLabel {
text: heightText map: _root.map
color: textColor text: heightText
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
} }
Rectangle { Rectangle {
width: 1 width: 1
height: ScreenTools.defaultFontPixelWidth * 1 height: ScreenTools.defaultFontPixelWidth * 1
color: textColor color: _textColor
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
} }
Rectangle { Rectangle {
width: ScreenTools.defaultFontPixelWidth * 3 width: ScreenTools.defaultFontPixelWidth * 3
height: 1 height: 1
color: textColor color: _textColor
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
} }
} }
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