Commit 37bf5d30 authored by Don Gagne's avatar Don Gagne Committed by GitHub

Merge pull request #5473 from DonLakeFlyer/MultiVehicleIndicators

Better display of vehicle indicators for multi-vehicle
parents 8bfc4dfe ea72b8bf
......@@ -32,15 +32,17 @@ MapQuickItem {
property real _uavSize: ScreenTools.defaultFontPixelHeight * 5
property real _adsbSize: ScreenTools.defaultFontPixelHeight * 1.5
property var _map: map
property bool _multiVehicle: QGroundControl.multiVehicleManager.vehicles.count > 1
sourceItem: Item {
id: vehicleItem
width: vehicleIcon.width
height: vehicleIcon.height
id: vehicleItem
width: vehicleIcon.width
height: vehicleIcon.height
opacity: vehicle ? (vehicle.active ? 1.0 : 0.5) : 1.0
Image {
id: vehicleIcon
source: _adsbVehicle ? "/qmlimages/adsbVehicle.svg" : (map.isSatelliteMap ? vehicle.vehicleImageOpaque : vehicle.vehicleImageOutline)
source: _adsbVehicle ? "/qmlimages/adsbVehicle.svg" : vehicle.vehicleImageOpaque
mipmap: true
width: size
sourceSize.width: size
......@@ -57,11 +59,15 @@ MapQuickItem {
anchors.top: parent.bottom
anchors.horizontalCenter: parent.horizontalCenter
map: _map
text: altText
text: vehicleLabelText
font.pointSize: ScreenTools.smallFontPointSize
visible: !isNaN(altitude)
visible: _adsbVehicle ? !isNaN(altitude) : _multiVehicle
property string altText: visible ? QGroundControl.metersToAppSettingsDistanceUnits(altitude).toFixed(0) + " " + QGroundControl.appSettingsDistanceUnitsString : ""
property string vehicleLabelText: visible ?
(_adsbVehicle ?
QGroundControl.metersToAppSettingsDistanceUnits(altitude).toFixed(0) + " " + QGroundControl.appSettingsDistanceUnitsString :
(_multiVehicle ? qsTr("Vehicle %1").arg(vehicle.id) : "")) :
""
}
}
......
......@@ -1579,7 +1579,10 @@ bool Vehicle::active(void)
void Vehicle::setActive(bool active)
{
_active = active;
if (_active != active) {
_active = active;
emit activeChanged(_active);
}
_startJoystick(_active);
}
......
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