Browse Source

Merge pull request #6603 from DonLakeFlyer/MoreFixes

More fixes
QGC4.4
Don Gagne 7 years ago committed by GitHub
parent
commit
359a08f021
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 12
      src/FlightDisplay/GuidedActionsController.qml
  2. 2
      src/PlanView/MissionItemStatus.qml
  3. 2
      src/QmlControls/DropPanel.qml
  4. 2
      src/QmlControls/MissionItemIndexLabel.qml

12
src/FlightDisplay/GuidedActionsController.qml

@ -152,8 +152,16 @@ Item { @@ -152,8 +152,16 @@ Item {
on__GuidedModeSupportedChanged: _outputState()
on__PauseVehicleSupportedChanged: _outputState()
on_CurrentMissionIndexChanged: console.log("_currentMissionIndex", _currentMissionIndex)
on_ResumeMissionIndexChanged: console.log("_resumeMissionIndex", _resumeMissionIndex)
on_CurrentMissionIndexChanged: {
if (__debugGuidedStates) {
console.log("_currentMissionIndex", _currentMissionIndex)
}
}
on_ResumeMissionIndexChanged: {
if (__debugGuidedStates) {
console.log("_resumeMissionIndex", _resumeMissionIndex)
}
}
onShowResumeMissionChanged: {
if (__debugGuidedStates) {
console.log("showResumeMission", showResumeMission)

2
src/PlanView/MissionItemStatus.qml

@ -73,6 +73,7 @@ Rectangle { @@ -73,6 +73,7 @@ Rectangle {
visible: display
property real availableHeight: height - indicator.height
property bool _coordValid: object.coordinate.isValid
property bool _terrainAvailable: !isNaN(object.terrainPercent)
property real _terrainPercent: _terrainAvailable ? object.terrainPercent : 1
@ -85,6 +86,7 @@ Rectangle { @@ -85,6 +86,7 @@ Rectangle {
width: indicator.width
height: _terrainAvailable ? Math.max(availableHeight * _terrainPercent, 1) : parent.height
color: _terrainAvailable ? (_terrainPercent > object.altPercent ? "red": qgcPal.text) : "yellow"
visible: _coordValid
}
MissionItemIndexLabel {

2
src/QmlControls/DropPanel.qml

@ -162,8 +162,6 @@ Item { @@ -162,8 +162,6 @@ Item {
Loader {
id: panelLoader
x: _dropMargin
y: _dropMargin
onHeightChanged: _calcPositions()
onWidthChanged: _calcPositions()

2
src/QmlControls/MissionItemIndexLabel.qml

@ -109,7 +109,7 @@ Canvas { @@ -109,7 +109,7 @@ Canvas {
verticalAlignment: Text.AlignVCenter
color: "white"
font.pointSize: ScreenTools.defaultFontPointSize
fontSizeMode: Text.HorizontalFit
fontSizeMode: Text.Fit
text: _index
}
}

Loading…
Cancel
Save