mirror of https://github.com/f4exb/sdrangel.git
Update map QML/HTML.
This commit is contained in:
parent
9506c93c11
commit
5d96a09520
Binary file not shown.
After Width: | Height: | Size: 3.6 KiB |
Binary file not shown.
After Width: | Height: | Size: 3.6 KiB |
|
@ -303,22 +303,18 @@ Item {
|
||||||
height: text.height + 5
|
height: text.height + 5
|
||||||
radius: 5
|
radius: 5
|
||||||
visible: mapTextVisible
|
visible: mapTextVisible
|
||||||
Text {
|
|
||||||
id: text
|
|
||||||
anchors.centerIn: parent
|
|
||||||
text: mapText
|
|
||||||
textFormat: TextEdit.RichText
|
|
||||||
}
|
|
||||||
MouseArea {
|
MouseArea {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
hoverEnabled: true
|
hoverEnabled: true
|
||||||
acceptedButtons: Qt.LeftButton | Qt.RightButton
|
acceptedButtons: Qt.LeftButton | Qt.RightButton
|
||||||
|
//propagateComposedEvents: true // so links in Text work
|
||||||
onClicked: {
|
onClicked: {
|
||||||
if (mouse.button === Qt.LeftButton) {
|
if (mouse.button === Qt.LeftButton) {
|
||||||
selected = !selected
|
selected = !selected
|
||||||
if (selected) {
|
if (selected) {
|
||||||
mapModel.moveToFront(mapModelFiltered.mapRowToSource(index))
|
mapModel.moveToFront(mapModelFiltered.mapRowToSource(index))
|
||||||
}
|
}
|
||||||
|
//mouse.accepted = false // propagate to text
|
||||||
} else if (mouse.button === Qt.RightButton) {
|
} else if (mouse.button === Qt.RightButton) {
|
||||||
menuItems.clear()
|
menuItems.clear()
|
||||||
menus.clear()
|
menus.clear()
|
||||||
|
@ -406,6 +402,17 @@ Item {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// Have Text after MouseArea, so links can be clicked
|
||||||
|
Text {
|
||||||
|
id: text
|
||||||
|
anchors.centerIn: parent
|
||||||
|
text: mapText
|
||||||
|
textFormat: TextEdit.RichText
|
||||||
|
onLinkActivated: {
|
||||||
|
console.log("Link", link);
|
||||||
|
mapModel.link(link);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
Binary file not shown.
After Width: | Height: | Size: 1.6 KiB |
|
@ -9,7 +9,7 @@ On top of this, it can plot data from other plugins, such as:
|
||||||
* Aircraft from the ADS-B Demodulator,
|
* Aircraft from the ADS-B Demodulator,
|
||||||
* Ships from the AIS Demodulator,
|
* Ships from the AIS Demodulator,
|
||||||
* Satellites from the Satellite Tracker,
|
* Satellites from the Satellite Tracker,
|
||||||
* Weather imagery from APT Demodulator,
|
* Satellite imagery from APT Demodulator,
|
||||||
* The Sun, Moon and Stars from the Star Tracker,
|
* The Sun, Moon and Stars from the Star Tracker,
|
||||||
* Weather balloons from the Radiosonde feature,
|
* Weather balloons from the Radiosonde feature,
|
||||||
* RF Heat Maps from the Heap Map channel,
|
* RF Heat Maps from the Heap Map channel,
|
||||||
|
@ -28,6 +28,7 @@ As well as internet data sources:
|
||||||
* Navtex transmitters,
|
* Navtex transmitters,
|
||||||
* VLF transmitters,
|
* VLF transmitters,
|
||||||
* KiwiSDRs,
|
* KiwiSDRs,
|
||||||
|
* Spy Servers,
|
||||||
* Weather radar,
|
* Weather radar,
|
||||||
* Satellite infra-red data (clouds),
|
* Satellite infra-red data (clouds),
|
||||||
* Sea marks,
|
* Sea marks,
|
||||||
|
|
Loading…
Reference in New Issue