Skip to content

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

Work around strange UT only failure

parent 4ecde73d
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
src/FlightDisplay/FlightDisplayView.qml
View file @ d1285c18
...@@ -84,9 +84,9 @@ Item { ...@@ -84,9 +84,9 @@ Item {
delegate: delegate:
VehicleMapItem { VehicleMapItem {
vehicle: object
coordinate: object.coordinate coordinate: object.coordinate
heading: object.heading isSatellite: flightMap.isSatelliteMap
isSatellite: isSatelliteMap
} }
} }
...@@ -124,7 +124,7 @@ Item { ...@@ -124,7 +124,7 @@ Item {
id: missionItemSummaryList id: missionItemSummaryList
anchors.margins: ScreenTools.defaultFontPixelWidth anchors.margins: ScreenTools.defaultFontPixelWidth
anchors.left: parent.left anchors.left: parent.left
anchors.right: mapWidgets.left anchors.right: flightMap.mapWidgets.left
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
height: ScreenTools.defaultFontPixelHeight * 7 height: ScreenTools.defaultFontPixelHeight * 7
spacing: ScreenTools.defaultFontPixelWidth / 2 spacing: ScreenTools.defaultFontPixelWidth / 2
......
src/FlightMap/MapItems/VehicleMapItem.qml
View file @ d1285c18
...@@ -26,6 +26,7 @@ This file is part of the QGROUNDCONTROL project ...@@ -26,6 +26,7 @@ This file is part of the QGROUNDCONTROL project
import QtQuick 2.4 import QtQuick 2.4
import QtLocation 5.3 import QtLocation 5.3
import QtPositioning 5.3
import QGroundControl.ScreenTools 1.0 import QGroundControl.ScreenTools 1.0
import QGroundControl.Vehicle 1.0 import QGroundControl.Vehicle 1.0
...@@ -37,7 +38,6 @@ MapQuickItem { ...@@ -37,7 +38,6 @@ MapQuickItem {
anchorPoint.x: vehicleIcon.width / 2 anchorPoint.x: vehicleIcon.width / 2
anchorPoint.y: vehicleIcon.height / 2 anchorPoint.y: vehicleIcon.height / 2
coordinate: vehicle.coordinate
visible: vehicle.satelliteLock >= 2 // 2D lock visible: vehicle.satelliteLock >= 2 // 2D lock
sourceItem: Image { sourceItem: Image {
......
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