Browse Source

Move range rings behind aircraft.

chirpmodem-v8.1.0
Jon Beniston 3 weeks ago
parent
commit
965fd2b096
  1. BIN
      doc/img/ADSBDemod_plugin.png
  2. 8
      plugins/channelrx/demodadsb/map/map_6.qml
  3. 7
      plugins/channelrx/demodadsb/map/map_6_strict.qml

BIN
doc/img/ADSBDemod_plugin.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 MiB

After

Width:  |  Height:  |  Size: 666 KiB

8
plugins/channelrx/demodadsb/map/map_6.qml

@ -77,25 +77,31 @@ Item { @@ -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 { @@ -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

7
plugins/channelrx/demodadsb/map/map_6_strict.qml

@ -74,31 +74,38 @@ Item { @@ -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

Loading…
Cancel
Save