Skip to content

Q
qgroundcontrol
Commit ebd8d82f authored by Don Gagne's avatar Don Gagne
Browse files
Options

Fix MissionItemStatus visibility/position

parent 8d6b18df
Show whitespace changes
Inline Side-by-side
Showing with 38 additions and 55 deletions
src/PlanView/MissionItemStatus.qml
View file @ ebd8d82f
...@@ -7,64 +7,52 @@ ...@@ -7,64 +7,52 @@
* *
****************************************************************************/ ****************************************************************************/
import QtQuick 2.3 import QtQuick 2.3
import QtQuick.Controls 1.2 import QtQuick.Controls 1.2
import QtQuick.Layouts 1.2 import QtQuick.Layouts 1.2
import QGroundControl 1.0
import QGroundControl.ScreenTools 1.0 import QGroundControl.ScreenTools 1.0
import QGroundControl.Controls 1.0 import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0 import QGroundControl.Palette 1.0
import QGroundControl 1.0
import QGroundControl.FactSystem 1.0 import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0 import QGroundControl.FactControls 1.0
Rectangle { Rectangle {
width: expandedWidth
height: ScreenTools.defaultFontPixelHeight * 7 height: ScreenTools.defaultFontPixelHeight * 7
radius: ScreenTools.defaultFontPixelWidth * 0.5 radius: ScreenTools.defaultFontPixelWidth * 0.5
color: qgcPal.window color: qgcPal.window
opacity: 0.80 opacity: 0.80
clip: true clip: true
property var currentMissionItem ///< Mission item to display status for
property var missionItems ///< List of all available mission items property var missionItems ///< List of all available mission items
property real expandedWidth ///< Width of control when expanded
property real missionDistance ///< Total mission distance
property real missionTime ///< Total mission time
property real missionMaxTelemetry
property bool _statusValid: currentMissionItem != undefined
property bool _missionValid: missionItems != undefined
property real _distance: _statusValid ? _currentMissionItem.distance : NaN readonly property real _margins: ScreenTools.defaultFontPixelWidth
property real _altDifference: _statusValid ? _currentMissionItem.altDifference : NaN
property real _gradient: _statusValid && _currentMissionItem.distance > 0 ? Math.atan(_currentMissionItem.altDifference / _currentMissionItem.distance) : NaN
property real _gradientPercent: isNaN(_gradient) ? NaN : _gradient * 100
property real _azimuth: _statusValid ? _currentMissionItem.azimuth : NaN
property real _missionDistance: _missionValid ? missionDistance : NaN
property real _missionMaxTelemetry: _missionValid ? missionMaxTelemetry : NaN
property real _missionTime: _missionValid ? missionTime : NaN
property string _distanceText: isNaN(_distance) ? "-.-" : QGroundControl.metersToAppSettingsDistanceUnits(_distance).toFixed(1) + " " + QGroundControl.appSettingsDistanceUnitsString QGCPalette { id: qgcPal }
property string _altDifferenceText: isNaN(_altDifference) ? "-.-" : QGroundControl.metersToAppSettingsDistanceUnits(_altDifference).toFixed(1) + " " + QGroundControl.appSettingsDistanceUnitsString
property string _gradientText: isNaN(_gradient) ? "-.-" : _gradientPercent.toFixed(0) + "%"
property string _azimuthText: isNaN(_azimuth) ? "-.-" : Math.round(_azimuth)
property string _missionDistanceText: isNaN(_missionDistance) ? "-.-" : QGroundControl.metersToAppSettingsDistanceUnits(_missionDistance).toFixed(1) + " " + QGroundControl.appSettingsDistanceUnitsString
property string _missionTimeText: isNaN(_missionTime) ? "-.-" : Number(_missionTime / 60).toFixed(1) + " min"
property string _missionMaxTelemetryText: isNaN(_missionMaxTelemetry) ? "-.-" : QGroundControl.metersToAppSettingsDistanceUnits(_missionMaxTelemetry).toFixed(1) + " " + QGroundControl.appSettingsDistanceUnitsString
readonly property real _margins: ScreenTools.defaultFontPixelWidth QGCLabel {
id: label
anchors.top: parent.bottom
width: parent.height
text: qsTr("Altitude")
horizontalAlignment: Text.AlignHCenter
rotation: -90
transformOrigin: Item.TopLeft
}
QGCListView { QGCListView {
id: statusListView id: statusListView
anchors.fill: parent
anchors.margins: _margins anchors.margins: _margins
anchors.top: parent.top
anchors.bottom: parent.bottom
anchors.leftMargin: ScreenTools.defaultFontPixelHeight
anchors.left: parent.left
anchors.right: parent.right
model: missionItems model: missionItems
highlightMoveDuration: 250 highlightMoveDuration: 250
orientation: ListView.Horizontal orientation: ListView.Horizontal
spacing: 0 spacing: 0
width: parent.width - (_margins * 2)
clip: true clip: true
currentIndex: _currentMissionIndex currentIndex: _currentMissionIndex
...@@ -92,3 +80,4 @@ Rectangle { ...@@ -92,3 +80,4 @@ Rectangle {
} }
} }
src/PlanView/PlanView.qml
View file @ ebd8d82f
...@@ -610,30 +610,6 @@ QGCView { ...@@ -610,30 +610,6 @@ QGCView {
} }
} }
} }
MapScale {
id: mapScale
anchors.margins: ScreenTools.defaultFontPixelHeight * (0.66)
anchors.bottom: waypointValuesDisplay.visible ? waypointValuesDisplay.top : parent.bottom
anchors.left: parent.left
mapControl: editorMap
visible: !ScreenTools.isTinyScreen
}
MissionItemStatus {
id: waypointValuesDisplay
anchors.margins: ScreenTools.defaultFontPixelWidth
anchors.left: parent.left
anchors.bottom: parent.bottom
z: QGroundControl.zOrderTopMost
currentMissionItem: _currentMissionItem
missionItems: missionController.visualItems
expandedWidth: missionItemEditor.x - (ScreenTools.defaultFontPixelWidth * 2)
missionDistance: missionController.missionDistance
missionTime: missionController.missionTime
missionMaxTelemetry: missionController.missionMaxTelemetry
visible: _editingLayer == _layerMission && !ScreenTools.isShortScreen
}
} // FlightMap } // FlightMap
// Right pane for mission editing controls // Right pane for mission editing controls
...@@ -795,6 +771,25 @@ QGCView { ...@@ -795,6 +771,25 @@ QGCView {
controller: rallyPointController controller: rallyPointController
} }
} // Right panel } // Right panel
MapScale {
id: mapScale
anchors.margins: ScreenTools.defaultFontPixelHeight * (0.66)
anchors.bottom: waypointValuesDisplay.visible ? waypointValuesDisplay.top : parent.bottom
anchors.left: parent.left
mapControl: editorMap
visible: !ScreenTools.isTinyScreen
}
MissionItemStatus {
id: waypointValuesDisplay
anchors.margins: ScreenTools.defaultFontPixelWidth
anchors.left: parent.left
anchors.right: rightPanel.left
anchors.bottom: parent.bottom
missionItems: missionController.visualItems
//visible: _editingLayer === _layerMission && !ScreenTools.isShortScreen
}
} // QGCViewPanel } // QGCViewPanel
Component { Component {
......
src/QmlControls/MissionItemIndexLabel.qml
View file @ ebd8d82f
...@@ -81,7 +81,6 @@ Canvas { ...@@ -81,7 +81,6 @@ Canvas {
visible: _label.length !== 0 visible: _label.length !== 0
} }
QGCLabel { QGCLabel {
id: labelControlLabel id: labelControlLabel
anchors.leftMargin: indicator.width + _labelMargin anchors.leftMargin: indicator.width + _labelMargin
......
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