Skip to content

Q
qgroundcontrol
Commit 76d57047 authored by Donald Gagne's avatar Donald Gagne
Browse files
Options

Add battery space 

Plus minor repositioning for better readability
parent 1db98986
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 17 deletions
src/MissionEditor/PlanToolBar.qml
View file @ 76d57047
...@@ -52,7 +52,7 @@ Rectangle { ...@@ -52,7 +52,7 @@ Rectangle {
property string _missionTimeText: isNaN(_missionTime) ? "-.-" : Number(_missionTime / 60).toFixed(1) + " min" property string _missionTimeText: isNaN(_missionTime) ? "-.-" : Number(_missionTime / 60).toFixed(1) + " min"
property string _missionMaxTelemetryText: isNaN(_missionMaxTelemetry) ? "-.-" : QGroundControl.metersToAppSettingsDistanceUnits(_missionMaxTelemetry).toFixed(1) + " " + QGroundControl.appSettingsDistanceUnitsString property string _missionMaxTelemetryText: isNaN(_missionMaxTelemetry) ? "-.-" : QGroundControl.metersToAppSettingsDistanceUnits(_missionMaxTelemetry).toFixed(1) + " " + QGroundControl.appSettingsDistanceUnitsString
readonly property real _margins: ScreenTools.defaultFontPixelWidth readonly property real _margins: ScreenTools.defaultFontPixelWidth
QGCPalette { id: qgcPal } QGCPalette { id: qgcPal }
...@@ -94,53 +94,81 @@ Rectangle { ...@@ -94,53 +94,81 @@ Rectangle {
} }
GridLayout { GridLayout {
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
columns: 4 columns: 5
rowSpacing: 0 rowSpacing: 0
columnSpacing: _margins columnSpacing: _margins / 4
QGCLabel { QGCLabel {
text: qsTr("Selected waypoint") text: qsTr("Selected waypoint")
Layout.columnSpan: 4 Layout.columnSpan: 5
font.pointSize: ScreenTools.smallFontPointSize font.pointSize: ScreenTools.smallFontPointSize
} }
QGCLabel { text: qsTr("Distance:") } QGCLabel { text: qsTr("Distance:") }
QGCLabel { text: _distanceText } QGCLabel { text: _distanceText }
Item { width: 1; height: 1 }
QGCLabel { text: qsTr("Gradient:") } QGCLabel { text: qsTr("Gradient:") }
QGCLabel { text: _gradientText } QGCLabel { text: _gradientText }
QGCLabel { text: qsTr("Alt diff:") } QGCLabel { text: qsTr("Alt diff:") }
QGCLabel { text: _altDifferenceText } QGCLabel { text: _altDifferenceText }
Item { width: 1; height: 1 }
QGCLabel { text: qsTr("Azimuth:") } QGCLabel { text: qsTr("Azimuth:") }
QGCLabel { text: _azimuthText } QGCLabel { text: _azimuthText }
} }
GridLayout { GridLayout {
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
columns: 4 columns: 5
rowSpacing: 0 rowSpacing: 0
columnSpacing: _margins columnSpacing: _margins / 4
QGCLabel { QGCLabel {
text: qsTr("Total mission") text: qsTr("Total mission")
Layout.columnSpan: 4 Layout.columnSpan: 5
font.pointSize: ScreenTools.smallFontPointSize font.pointSize: ScreenTools.smallFontPointSize
} }
QGCLabel { text: qsTr("Distance:") } QGCLabel { text: qsTr("Distance:") }
QGCLabel { text: _missionDistanceText } QGCLabel { text: _missionDistanceText }
Item { width: 1; height: 1 }
QGCLabel { text: qsTr("Max telem dist:") } QGCLabel { text: qsTr("Max telem dist:") }
QGCLabel { text: _missionMaxTelemetryText } QGCLabel { text: _missionMaxTelemetryText }
QGCLabel { text: qsTr("Time:") } QGCLabel { text: qsTr("Time:") }
QGCLabel { text: _missionTimeText } QGCLabel { text: _missionTimeText }
} }
GridLayout {
anchors.top: parent.top
anchors.bottom: parent.bottom
columns: 3
rowSpacing: 0
columnSpacing: _margins / 4
QGCLabel {
text: qsTr("Battery")
Layout.columnSpan: 3
font.pointSize: ScreenTools.smallFontPointSize
}
QGCLabel { text: qsTr("Batteries required:") }
QGCLabel { text: "--.--" }
Item { width: 1; height: 1 }
QGCLabel { text: qsTr("Swap waypoint:") }
QGCLabel { text: "--" }
}
} }
QGCButton { QGCButton {
......
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