diff --git a/doc/img/ADSBDemod_plugin.png b/doc/img/ADSBDemod_plugin.png index 81daa2730..72f19f122 100644 Binary files a/doc/img/ADSBDemod_plugin.png and b/doc/img/ADSBDemod_plugin.png differ diff --git a/plugins/channelrx/demodadsb/map/map_6.qml b/plugins/channelrx/demodadsb/map/map_6.qml index b087ffdb4..5bc7a3820 100644 --- a/plugins/channelrx/demodadsb/map/map_6.qml +++ b/plugins/channelrx/demodadsb/map/map_6.qml @@ -77,25 +77,31 @@ Item { parent: mapView.map } + // Explicit z, as Qt 6 stacks sibling MapItemViews in reverse declaration order, + // which would draw airspaces, navaids and airports on top of aircraft MapItemView { + z: 1 model: airspaceModel delegate: airspaceComponent parent: mapView.map } MapItemView { + z: 2 model: navAidModel delegate: navAidComponent parent: mapView.map } MapItemView { + z: 3 model: airspaceModel delegate: airspaceNameComponent parent: mapView.map } MapItemView { + z: 4 model: airportModel delegate: airportComponent parent: mapView.map @@ -103,12 +109,14 @@ Item { // This needs to be before aircraftComponent MapItemView, so it's drawn underneath MapItemView { + z: 5 model: aircraftModel delegate: aircraftPathComponent parent: mapView.map } MapItemView { + z: 6 model: aircraftModel delegate: aircraftComponent parent: mapView.map diff --git a/plugins/channelrx/demodadsb/map/map_6_strict.qml b/plugins/channelrx/demodadsb/map/map_6_strict.qml index a753cd299..ca7dcc0ef 100644 --- a/plugins/channelrx/demodadsb/map/map_6_strict.qml +++ b/plugins/channelrx/demodadsb/map/map_6_strict.qml @@ -74,31 +74,38 @@ Item { parent: mapView.map } + // Explicit z, as Qt 6 stacks sibling MapItemViews in reverse declaration order, + // which would draw airspaces, navaids and airports on top of aircraft MapItemView { + z: 1 model: airspaceModel delegate: airspaceComponent parent: mapView.map } MapItemView { + z: 2 model: navAidModel delegate: navAidComponent parent: mapView.map } MapItemView { + z: 3 model: airspaceModel delegate: airspaceNameComponent parent: mapView.map } MapItemView { + z: 4 model: airportModel delegate: airportComponent parent: mapView.map } MapItemView { + z: 5 model: aircraftModel delegate: aircraftComponent parent: mapView.map