mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-18 03:27:26 -05:00
Compare commits
3 Commits
master
...
2660-now-p
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ac8e80dd36 | ||
|
|
e9207e4067 | ||
|
|
a4a3a67901 |
38
README.md
38
README.md
@@ -1,31 +1,7 @@
|
|||||||

|

|
||||||

|

|
||||||
[](https://github.com/DSheirer/sdrtrunk/releases/latest)
|
|
||||||
[](https://github.com/DSheirer/sdrtrunk/releases)
|
|
||||||
[](LICENSE)
|
|
||||||
[](https://discord.gg/HJQaKYE)
|
|
||||||
[](https://groups.google.com/g/sdrtrunk)
|
|
||||||
|
|
||||||
# sdrtrunk
|
# MacOS Tahoe 26.1 Users - Attention:
|
||||||
A cross-platform java application for decoding, monitoring, recording and streaming trunked mobile and related radio protocols using Software Defined Radios (SDR).
|
|
||||||
|
|
||||||
> ## 📖 [Read the sdrtrunk User Manual](https://github.com/DSheirer/sdrtrunk/wiki/User-Manual)
|
|
||||||
> New to sdrtrunk? Start with the **[Getting Started](https://github.com/DSheirer/sdrtrunk/wiki/Getting-Started)** guide,
|
|
||||||
> then use the **[User Manual](https://github.com/DSheirer/sdrtrunk/wiki/User-Manual)** and
|
|
||||||
> **[How-To Guides](https://github.com/DSheirer/sdrtrunk/wiki/How-To-Guides)** to set up tuners, playlists, aliases and streaming.
|
|
||||||
|
|
||||||
* [Help/Wiki Home Page](https://github.com/DSheirer/sdrtrunk/wiki)
|
|
||||||
* [Getting Started](https://github.com/DSheirer/sdrtrunk/wiki/Getting-Started)
|
|
||||||
* [User Manual](https://github.com/DSheirer/sdrtrunk/wiki/User-Manual)
|
|
||||||
* [How-To Guides](https://github.com/DSheirer/sdrtrunk/wiki/How-To-Guides)
|
|
||||||
* [FAQ](https://github.com/DSheirer/sdrtrunk/wiki/FAQ)
|
|
||||||
* [Download](https://github.com/DSheirer/sdrtrunk/releases)
|
|
||||||
* [Support](https://github.com/DSheirer/sdrtrunk/wiki/Support)
|
|
||||||
|
|
||||||

|
|
||||||
**Figure 1:** sdrtrunk decoding a P25 Phase 1 simulcast trunked radio system
|
|
||||||
|
|
||||||
## MacOS Tahoe 26.1 Users - Attention
|
|
||||||
Changes to USB support in Tahoe version 26.x cause sdrtrunk to fail to launch. Do the following to install the latest libusb and create a symbolic link and then use the nightly build which includes an updated usb4java native library for Tahoe with ARM processor. There may still be issue(s) with MacOS accessing your USB SDR tuners.
|
Changes to USB support in Tahoe version 26.x cause sdrtrunk to fail to launch. Do the following to install the latest libusb and create a symbolic link and then use the nightly build which includes an updated usb4java native library for Tahoe with ARM processor. There may still be issue(s) with MacOS accessing your USB SDR tuners.
|
||||||
|
|
||||||
```
|
```
|
||||||
@@ -43,6 +19,18 @@ Finally, create a symbolic link from the installed library to the place where us
|
|||||||
sudo ln -s /opt/homebrew/Cellar/libusb/HEAD-9ceaa52/lib/libusb-1.0.0.dylib /opt/local/lib/libusb-1.0.0.dylib
|
sudo ln -s /opt/homebrew/Cellar/libusb/HEAD-9ceaa52/lib/libusb-1.0.0.dylib /opt/local/lib/libusb-1.0.0.dylib
|
||||||
```
|
```
|
||||||
|
|
||||||
|
# sdrtrunk
|
||||||
|
A cross-platform java application for decoding, monitoring, recording and streaming trunked mobile and related radio protocols using Software Defined Radios (SDR).
|
||||||
|
|
||||||
|
* [Help/Wiki Home Page](https://github.com/DSheirer/sdrtrunk/wiki)
|
||||||
|
* [Getting Started](https://github.com/DSheirer/sdrtrunk/wiki/Getting-Started)
|
||||||
|
* [User's Manual](https://github.com/DSheirer/sdrtrunk/wiki/User-Manual)
|
||||||
|
* [Download](https://github.com/DSheirer/sdrtrunk/releases)
|
||||||
|
* [Support](https://github.com/DSheirer/sdrtrunk/wiki/Support)
|
||||||
|
|
||||||
|

|
||||||
|
**Figure 1:** sdrtrunk Application Screenshot
|
||||||
|
|
||||||
## Download the Latest Release
|
## Download the Latest Release
|
||||||
All release versions of sdrtrunk are available from the [releases](https://github.com/DSheirer/sdrtrunk/releases) tab.
|
All release versions of sdrtrunk are available from the [releases](https://github.com/DSheirer/sdrtrunk/releases) tab.
|
||||||
|
|
||||||
|
|||||||
@@ -1,269 +0,0 @@
|
|||||||
/*
|
|
||||||
* *****************************************************************************
|
|
||||||
* Copyright (C) 2014-2026 Dennis Sheirer
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
|
||||||
* ****************************************************************************
|
|
||||||
*/
|
|
||||||
|
|
||||||
package io.github.dsheirer.alias;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
|
||||||
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
|
|
||||||
import javafx.beans.Observable;
|
|
||||||
import javafx.beans.property.BooleanProperty;
|
|
||||||
import javafx.beans.property.IntegerProperty;
|
|
||||||
import javafx.beans.property.LongProperty;
|
|
||||||
import javafx.beans.property.SimpleBooleanProperty;
|
|
||||||
import javafx.beans.property.SimpleIntegerProperty;
|
|
||||||
import javafx.beans.property.SimpleLongProperty;
|
|
||||||
import javafx.beans.property.SimpleStringProperty;
|
|
||||||
import javafx.beans.property.StringProperty;
|
|
||||||
import javafx.util.Callback;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Persisted settings for an alias list. Alias lists are otherwise identified only by the list name that each alias
|
|
||||||
* carries, so settings that belong to the list itself, like tracking a Radio Reference system, are stored here and
|
|
||||||
* saved in the playlist.
|
|
||||||
*
|
|
||||||
* Radio Reference tracking uses two timestamps from the Radio Reference system's last updated value: the last updated
|
|
||||||
* value seen by the most recent check, and the last updated value that the aliases were synchronized to. When the
|
|
||||||
* seen value is newer than the synchronized value, the system changed on Radio Reference and the aliases haven't
|
|
||||||
* been updated yet.
|
|
||||||
*/
|
|
||||||
public class AliasListConfiguration
|
|
||||||
{
|
|
||||||
public static final int NO_SYSTEM = 0;
|
|
||||||
|
|
||||||
private StringProperty mName = new SimpleStringProperty();
|
|
||||||
private IntegerProperty mRadioReferenceSystemId = new SimpleIntegerProperty(NO_SYSTEM);
|
|
||||||
private StringProperty mRadioReferenceSystemName = new SimpleStringProperty();
|
|
||||||
private BooleanProperty mAutoUpdate = new SimpleBooleanProperty();
|
|
||||||
private LongProperty mRadioReferenceLastUpdated = new SimpleLongProperty();
|
|
||||||
private LongProperty mSynchronizedLastUpdated = new SimpleLongProperty();
|
|
||||||
private LongProperty mLastChecked = new SimpleLongProperty();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Jackson constructor
|
|
||||||
*/
|
|
||||||
public AliasListConfiguration()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Constructs an instance
|
|
||||||
* @param name of the alias list
|
|
||||||
*/
|
|
||||||
public AliasListConfiguration(String name)
|
|
||||||
{
|
|
||||||
setName(name);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Extractor so that observable lists of configurations report changes to the persisted properties.
|
|
||||||
*/
|
|
||||||
public static Callback<AliasListConfiguration,Observable[]> extractor()
|
|
||||||
{
|
|
||||||
return (AliasListConfiguration c) -> new Observable[] {c.mName, c.mRadioReferenceSystemId,
|
|
||||||
c.mRadioReferenceSystemName, c.mAutoUpdate, c.mRadioReferenceLastUpdated, c.mSynchronizedLastUpdated,
|
|
||||||
c.mLastChecked};
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Alias list name
|
|
||||||
*/
|
|
||||||
@JacksonXmlProperty(isAttribute = true, localName = "name")
|
|
||||||
public String getName()
|
|
||||||
{
|
|
||||||
return mName.get();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setName(String name)
|
|
||||||
{
|
|
||||||
mName.set(name);
|
|
||||||
}
|
|
||||||
|
|
||||||
@JsonIgnore
|
|
||||||
public StringProperty nameProperty()
|
|
||||||
{
|
|
||||||
return mName;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Indicates if this alias list tracks a Radio Reference system.
|
|
||||||
*/
|
|
||||||
@JsonIgnore
|
|
||||||
public boolean isTrackingRadioReferenceSystem()
|
|
||||||
{
|
|
||||||
return getRadioReferenceSystemId() > NO_SYSTEM;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Indicates if this alias list tracks the specified Radio Reference system.
|
|
||||||
*/
|
|
||||||
public boolean isTracking(int systemId)
|
|
||||||
{
|
|
||||||
return systemId > NO_SYSTEM && getRadioReferenceSystemId() == systemId;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Radio Reference system ID tracked by this alias list, or NO_SYSTEM (0).
|
|
||||||
*/
|
|
||||||
@JacksonXmlProperty(isAttribute = true, localName = "rr_system_id")
|
|
||||||
public int getRadioReferenceSystemId()
|
|
||||||
{
|
|
||||||
return mRadioReferenceSystemId.get();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setRadioReferenceSystemId(int systemId)
|
|
||||||
{
|
|
||||||
mRadioReferenceSystemId.set(systemId);
|
|
||||||
}
|
|
||||||
|
|
||||||
@JsonIgnore
|
|
||||||
public IntegerProperty radioReferenceSystemIdProperty()
|
|
||||||
{
|
|
||||||
return mRadioReferenceSystemId;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Radio Reference system name, for display.
|
|
||||||
*/
|
|
||||||
@JacksonXmlProperty(isAttribute = true, localName = "rr_system_name")
|
|
||||||
public String getRadioReferenceSystemName()
|
|
||||||
{
|
|
||||||
return mRadioReferenceSystemName.get();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setRadioReferenceSystemName(String name)
|
|
||||||
{
|
|
||||||
mRadioReferenceSystemName.set(name);
|
|
||||||
}
|
|
||||||
|
|
||||||
@JsonIgnore
|
|
||||||
public StringProperty radioReferenceSystemNameProperty()
|
|
||||||
{
|
|
||||||
return mRadioReferenceSystemName;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Indicates if talkgroups are automatically added or updated as aliases when the system changes on Radio Reference.
|
|
||||||
*/
|
|
||||||
@JacksonXmlProperty(isAttribute = true, localName = "rr_auto_update")
|
|
||||||
public boolean isAutoUpdate()
|
|
||||||
{
|
|
||||||
return mAutoUpdate.get();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setAutoUpdate(boolean autoUpdate)
|
|
||||||
{
|
|
||||||
mAutoUpdate.set(autoUpdate);
|
|
||||||
}
|
|
||||||
|
|
||||||
@JsonIgnore
|
|
||||||
public BooleanProperty autoUpdateProperty()
|
|
||||||
{
|
|
||||||
return mAutoUpdate;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Radio Reference last updated timestamp (ms since epoch) for the system, as seen by the most recent check.
|
|
||||||
*/
|
|
||||||
@JacksonXmlProperty(isAttribute = true, localName = "rr_last_updated")
|
|
||||||
public long getRadioReferenceLastUpdated()
|
|
||||||
{
|
|
||||||
return mRadioReferenceLastUpdated.get();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setRadioReferenceLastUpdated(long timestamp)
|
|
||||||
{
|
|
||||||
mRadioReferenceLastUpdated.set(timestamp);
|
|
||||||
}
|
|
||||||
|
|
||||||
@JsonIgnore
|
|
||||||
public LongProperty radioReferenceLastUpdatedProperty()
|
|
||||||
{
|
|
||||||
return mRadioReferenceLastUpdated;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Radio Reference last updated timestamp (ms since epoch) that the aliases were last synchronized to.
|
|
||||||
*/
|
|
||||||
@JacksonXmlProperty(isAttribute = true, localName = "rr_synchronized")
|
|
||||||
public long getSynchronizedLastUpdated()
|
|
||||||
{
|
|
||||||
return mSynchronizedLastUpdated.get();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setSynchronizedLastUpdated(long timestamp)
|
|
||||||
{
|
|
||||||
mSynchronizedLastUpdated.set(timestamp);
|
|
||||||
}
|
|
||||||
|
|
||||||
@JsonIgnore
|
|
||||||
public LongProperty synchronizedLastUpdatedProperty()
|
|
||||||
{
|
|
||||||
return mSynchronizedLastUpdated;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Time (ms since epoch) of the most recent successful check of the system on Radio Reference.
|
|
||||||
*/
|
|
||||||
@JacksonXmlProperty(isAttribute = true, localName = "rr_last_checked")
|
|
||||||
public long getLastChecked()
|
|
||||||
{
|
|
||||||
return mLastChecked.get();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setLastChecked(long timestamp)
|
|
||||||
{
|
|
||||||
mLastChecked.set(timestamp);
|
|
||||||
}
|
|
||||||
|
|
||||||
@JsonIgnore
|
|
||||||
public LongProperty lastCheckedProperty()
|
|
||||||
{
|
|
||||||
return mLastChecked;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Indicates if the most recent check saw a system change on Radio Reference that the aliases don't include yet.
|
|
||||||
*/
|
|
||||||
@JsonIgnore
|
|
||||||
public boolean isUpdateAvailable()
|
|
||||||
{
|
|
||||||
return isTrackingRadioReferenceSystem() && getRadioReferenceLastUpdated() > getSynchronizedLastUpdated();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Starts tracking the Radio Reference system. Clears timestamps so that the next refresh synchronizes.
|
|
||||||
*/
|
|
||||||
public void track(int systemId, String systemName)
|
|
||||||
{
|
|
||||||
setRadioReferenceSystemId(systemId);
|
|
||||||
setRadioReferenceSystemName(systemName);
|
|
||||||
setRadioReferenceLastUpdated(0);
|
|
||||||
setSynchronizedLastUpdated(0);
|
|
||||||
setLastChecked(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Stops tracking any Radio Reference system.
|
|
||||||
*/
|
|
||||||
public void stopTracking()
|
|
||||||
{
|
|
||||||
track(NO_SYSTEM, null);
|
|
||||||
setAutoUpdate(false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -46,8 +46,6 @@ public class AliasModel
|
|||||||
private ObservableList<Alias> mAliases = FXCollections.observableArrayList(Alias.extractor());
|
private ObservableList<Alias> mAliases = FXCollections.observableArrayList(Alias.extractor());
|
||||||
private ObservableList<String> mAliasListNames = FXCollections.observableArrayList();
|
private ObservableList<String> mAliasListNames = FXCollections.observableArrayList();
|
||||||
private Map<String,AliasList> mAliasListMap = new HashMap<>();
|
private Map<String,AliasList> mAliasListMap = new HashMap<>();
|
||||||
private ObservableList<AliasListConfiguration> mAliasListConfigurations =
|
|
||||||
FXCollections.observableArrayList(AliasListConfiguration.extractor());
|
|
||||||
|
|
||||||
public AliasModel()
|
public AliasModel()
|
||||||
{
|
{
|
||||||
@@ -65,99 +63,6 @@ public class AliasModel
|
|||||||
return mAliasListNames;
|
return mAliasListNames;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Observable list of persisted alias list configurations. Only alias lists with settings, like Radio Reference
|
|
||||||
* system tracking, have a configuration.
|
|
||||||
*/
|
|
||||||
public ObservableList<AliasListConfiguration> aliasListConfigurations()
|
|
||||||
{
|
|
||||||
return mAliasListConfigurations;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Bulk loading of alias list configurations from a playlist. Ignores configurations without a name and
|
|
||||||
* duplicates of an earlier configuration's name.
|
|
||||||
*/
|
|
||||||
public void addAliasListConfigurations(List<AliasListConfiguration> configurations)
|
|
||||||
{
|
|
||||||
if(configurations != null)
|
|
||||||
{
|
|
||||||
for(AliasListConfiguration configuration: configurations)
|
|
||||||
{
|
|
||||||
String name = configuration.getName();
|
|
||||||
|
|
||||||
if(name != null && !name.isEmpty() && getAliasListConfiguration(name) == null)
|
|
||||||
{
|
|
||||||
mAliasListConfigurations.add(configuration);
|
|
||||||
addAliasList(name);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Configuration for the named alias list.
|
|
||||||
* @param aliasListName to find
|
|
||||||
* @return configuration or null if the alias list doesn't have one
|
|
||||||
*/
|
|
||||||
public AliasListConfiguration getAliasListConfiguration(String aliasListName)
|
|
||||||
{
|
|
||||||
if(aliasListName != null)
|
|
||||||
{
|
|
||||||
for(AliasListConfiguration configuration: mAliasListConfigurations)
|
|
||||||
{
|
|
||||||
if(aliasListName.equals(configuration.getName()))
|
|
||||||
{
|
|
||||||
return configuration;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Configuration for the named alias list, created when the alias list doesn't have one.
|
|
||||||
* @param aliasListName for the configuration, not null or the (No Alias List) name
|
|
||||||
* @return configuration
|
|
||||||
*/
|
|
||||||
public AliasListConfiguration getOrCreateAliasListConfiguration(String aliasListName)
|
|
||||||
{
|
|
||||||
if(aliasListName == null || aliasListName.isEmpty() || aliasListName.equals(NO_ALIAS_LIST))
|
|
||||||
{
|
|
||||||
throw new IllegalArgumentException("Invalid alias list name [" + aliasListName + "]");
|
|
||||||
}
|
|
||||||
|
|
||||||
AliasListConfiguration configuration = getAliasListConfiguration(aliasListName);
|
|
||||||
|
|
||||||
if(configuration == null)
|
|
||||||
{
|
|
||||||
configuration = new AliasListConfiguration(aliasListName);
|
|
||||||
mAliasListConfigurations.add(configuration);
|
|
||||||
addAliasList(aliasListName);
|
|
||||||
}
|
|
||||||
|
|
||||||
return configuration;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Name of the first alias list that tracks the Radio Reference system.
|
|
||||||
* @param systemId of the Radio Reference system
|
|
||||||
* @return alias list name or null
|
|
||||||
*/
|
|
||||||
public String getAliasListNameTracking(int systemId)
|
|
||||||
{
|
|
||||||
for(AliasListConfiguration configuration: mAliasListConfigurations)
|
|
||||||
{
|
|
||||||
if(configuration.isTracking(systemId))
|
|
||||||
{
|
|
||||||
return configuration.getName();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Clears and reloads the list of alias list names from the current set of aliases.
|
* Clears and reloads the list of alias list names from the current set of aliases.
|
||||||
*/
|
*/
|
||||||
@@ -174,15 +79,6 @@ public class AliasModel
|
|||||||
mAliasListNames.add(aliasListName);
|
mAliasListNames.add(aliasListName);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//Alias lists with a configuration exist even before they have any aliases
|
|
||||||
for(AliasListConfiguration configuration: mAliasListConfigurations)
|
|
||||||
{
|
|
||||||
if(!mAliasListNames.contains(configuration.getName()))
|
|
||||||
{
|
|
||||||
mAliasListNames.add(configuration.getName());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -197,22 +93,7 @@ public class AliasModel
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
mAliases.stream().filter(alias -> oldName.equals(alias.getAliasListName())).forEach(alias -> alias.setAliasListName(newName));
|
mAliases.stream().filter(alias -> alias.getAliasListName().equals(oldName)).forEach(alias -> alias.setAliasListName(newName));
|
||||||
|
|
||||||
AliasListConfiguration configuration = getAliasListConfiguration(oldName);
|
|
||||||
|
|
||||||
if(configuration != null)
|
|
||||||
{
|
|
||||||
//Merging into an existing list keeps that list's configuration
|
|
||||||
if(getAliasListConfiguration(newName) == null)
|
|
||||||
{
|
|
||||||
configuration.setName(newName);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
mAliasListConfigurations.remove(configuration);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -228,7 +109,6 @@ public class AliasModel
|
|||||||
|
|
||||||
mAliases.removeIf(alias -> alias.getAliasListName().equals(aliasListName));
|
mAliases.removeIf(alias -> alias.getAliasListName().equals(aliasListName));
|
||||||
mAliasListMap.remove(aliasListName);
|
mAliasListMap.remove(aliasListName);
|
||||||
mAliasListConfigurations.removeIf(configuration -> aliasListName.equals(configuration.getName()));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -266,7 +146,6 @@ public class AliasModel
|
|||||||
removeAlias(alias);
|
removeAlias(alias);
|
||||||
}
|
}
|
||||||
|
|
||||||
mAliasListConfigurations.clear();
|
|
||||||
mAliasListNames.clear();
|
mAliasListNames.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,455 +0,0 @@
|
|||||||
/*
|
|
||||||
* *****************************************************************************
|
|
||||||
* Copyright (C) 2014-2026 Dennis Sheirer
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
|
||||||
* ****************************************************************************
|
|
||||||
*/
|
|
||||||
|
|
||||||
package io.github.dsheirer.alias;
|
|
||||||
|
|
||||||
import com.google.common.annotations.VisibleForTesting;
|
|
||||||
import io.github.dsheirer.alias.id.AliasID;
|
|
||||||
import io.github.dsheirer.alias.id.radio.NXDNTypeDRadio;
|
|
||||||
import io.github.dsheirer.alias.id.radio.P25FullyQualifiedRadio;
|
|
||||||
import io.github.dsheirer.alias.id.radio.Radio;
|
|
||||||
import io.github.dsheirer.identifier.alias.TalkerAliasIdentifier;
|
|
||||||
import io.github.dsheirer.identifier.radio.FullyQualifiedRadioIdentifier;
|
|
||||||
import io.github.dsheirer.identifier.radio.RadioIdentifier;
|
|
||||||
import io.github.dsheirer.module.decode.nxdn.identifier.NXDNRadioIdentifier;
|
|
||||||
import io.github.dsheirer.protocol.Protocol;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.function.BiConsumer;
|
|
||||||
import javafx.application.Platform;
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Automatically adds decoded talker aliases to an alias list as radio aliases, using the talker alias as the alias name,
|
|
||||||
* and renames a stored radio alias when the radio's talker alias changes.
|
|
||||||
*
|
|
||||||
* Talker aliases span up to 4 messages, so a decoded talker alias can be a fragment (the leading characters) of the
|
|
||||||
* full alias, even when the decoder reports it as complete. To avoid replacing a full alias with a fragment:
|
|
||||||
* <ul>
|
|
||||||
* <li>A decoded alias that is the start of the stored alias name is a fragment and never replaces it.</li>
|
|
||||||
* <li>A decoded alias that starts with the stored alias name is a longer version of a stored fragment and
|
|
||||||
* replaces it.</li>
|
|
||||||
* <li>Any other decoded alias that differs from the stored alias name replaces it only after it is decoded
|
|
||||||
* {@link #CONFIRMATIONS_REQUIRED} times in a row for the radio.</li>
|
|
||||||
* </ul>
|
|
||||||
*
|
|
||||||
* Only aliases whose only identifier is the radio are created or renamed. An alias that combines the radio with other
|
|
||||||
* identifiers (e.g. several radios or talkgroups) is left alone.
|
|
||||||
*
|
|
||||||
* This class is thread safe. Talker aliases are received on decoder threads and the alias model is updated on the
|
|
||||||
* JavaFX application thread.
|
|
||||||
*/
|
|
||||||
public class TalkerAliasAutoAdder implements BiConsumer<RadioIdentifier,TalkerAliasIdentifier>
|
|
||||||
{
|
|
||||||
private static final Logger mLog = LoggerFactory.getLogger(TalkerAliasAutoAdder.class);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Group assigned to aliases created from talker aliases.
|
|
||||||
*/
|
|
||||||
public static final String ALIAS_GROUP = "Talker Alias";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Number of consecutive times a different talker alias must be decoded for a radio before it replaces the stored
|
|
||||||
* alias name.
|
|
||||||
*/
|
|
||||||
public static final int CONFIRMATIONS_REQUIRED = 2;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Interval for re-checking the stored alias for a talker alias that was already checked, so that a renamed or
|
|
||||||
* deleted alias is restored without checking the alias list for every decoded talker alias.
|
|
||||||
*/
|
|
||||||
private static final long RECHECK_INTERVAL_MS = 30_000;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Outcome of comparing a decoded talker alias with the stored alias name.
|
|
||||||
*/
|
|
||||||
public enum Decision
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* The stored alias name matches the talker alias.
|
|
||||||
*/
|
|
||||||
UNCHANGED,
|
|
||||||
/**
|
|
||||||
* The talker alias is a fragment of the stored alias name.
|
|
||||||
*/
|
|
||||||
FRAGMENT,
|
|
||||||
/**
|
|
||||||
* The talker alias differs from the stored alias name and is waiting for more decodes.
|
|
||||||
*/
|
|
||||||
AWAIT_CONFIRMATION,
|
|
||||||
/**
|
|
||||||
* The talker alias replaces the stored alias name.
|
|
||||||
*/
|
|
||||||
UPDATE
|
|
||||||
}
|
|
||||||
|
|
||||||
private final AliasModel mAliasModel;
|
|
||||||
private final String mAliasListName;
|
|
||||||
//Guarded by this
|
|
||||||
private final Map<String,Candidate> mCandidates = new HashMap<>();
|
|
||||||
private final Map<String,Checked> mChecked = new HashMap<>();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Constructs an instance
|
|
||||||
* @param aliasModel to add aliases to
|
|
||||||
* @param aliasListName of the alias list to add aliases to
|
|
||||||
*/
|
|
||||||
public TalkerAliasAutoAdder(AliasModel aliasModel, String aliasListName)
|
|
||||||
{
|
|
||||||
mAliasModel = aliasModel;
|
|
||||||
mAliasListName = aliasListName;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Name of the alias list that talker aliases are added to.
|
|
||||||
*/
|
|
||||||
public String getAliasListName()
|
|
||||||
{
|
|
||||||
return mAliasListName;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Processes a talker alias that is assigned to a radio.
|
|
||||||
* @param radio that the talker alias belongs to
|
|
||||||
* @param talkerAlias for the radio
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public void accept(RadioIdentifier radio, TalkerAliasIdentifier talkerAlias)
|
|
||||||
{
|
|
||||||
if(radio == null || talkerAlias == null || mAliasListName == null || mAliasListName.isEmpty())
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
String value = normalize(talkerAlias.getValue());
|
|
||||||
Radio aliasId = createAliasId(radio);
|
|
||||||
|
|
||||||
if(value == null || aliasId == null || !aliasId.isValid())
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
String key = getKey(aliasId);
|
|
||||||
long now = System.currentTimeMillis();
|
|
||||||
int confirmations;
|
|
||||||
|
|
||||||
synchronized(this)
|
|
||||||
{
|
|
||||||
Checked checked = mChecked.get(key);
|
|
||||||
|
|
||||||
if(checked != null && checked.value().equals(value) && (now - checked.timestamp()) < RECHECK_INTERVAL_MS)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
confirmations = confirm(key, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
runOnFxThread(() -> apply(radio, aliasId, key, value, confirmations));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Counts the consecutive decodes of the talker alias for the radio. A fragment of the talker alias that is
|
|
||||||
* waiting for confirmation doesn't interrupt the count, because fragments are decoded while the full alias is
|
|
||||||
* assembled.
|
|
||||||
* @return number of consecutive decodes of the value, including this one.
|
|
||||||
*/
|
|
||||||
private int confirm(String key, String value)
|
|
||||||
{
|
|
||||||
Candidate candidate = mCandidates.get(key);
|
|
||||||
|
|
||||||
if(candidate != null && candidate.value().equals(value))
|
|
||||||
{
|
|
||||||
candidate = new Candidate(value, candidate.count() + 1);
|
|
||||||
mCandidates.put(key, candidate);
|
|
||||||
return candidate.count();
|
|
||||||
}
|
|
||||||
|
|
||||||
if(candidate != null && isFragment(value, candidate.value()))
|
|
||||||
{
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
mCandidates.put(key, new Candidate(value, 1));
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates or updates the alias for the radio. Runs on the JavaFX application thread.
|
|
||||||
*/
|
|
||||||
private synchronized void apply(RadioIdentifier radio, Radio aliasId, String key, String value, int confirmations)
|
|
||||||
{
|
|
||||||
AliasList aliasList = mAliasModel.getAliasList(mAliasListName);
|
|
||||||
Alias existing = findExactMatch(aliasList.getAliases(radio), aliasId);
|
|
||||||
|
|
||||||
if(existing == null)
|
|
||||||
{
|
|
||||||
Alias alias = new Alias(value);
|
|
||||||
alias.setAliasListName(mAliasListName);
|
|
||||||
alias.setGroup(ALIAS_GROUP);
|
|
||||||
alias.addAliasID(aliasId);
|
|
||||||
mAliasModel.addAlias(alias);
|
|
||||||
markChecked(key, value);
|
|
||||||
mLog.info("Talker alias [" + value + "] added for radio [" + aliasId + "] to alias list [" +
|
|
||||||
mAliasListName + "]");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(getIdentityCount(existing) > 1)
|
|
||||||
{
|
|
||||||
//The alias also identifies other radios or talkgroups - leave it alone.
|
|
||||||
markChecked(key, value);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
String stored = normalize(existing.getName());
|
|
||||||
|
|
||||||
switch(decide(stored, value, confirmations))
|
|
||||||
{
|
|
||||||
case UPDATE:
|
|
||||||
existing.setName(value);
|
|
||||||
markChecked(key, value);
|
|
||||||
mLog.info("Talker alias for radio [" + aliasId + "] in alias list [" + mAliasListName +
|
|
||||||
"] changed from [" + stored + "] to [" + value + "]");
|
|
||||||
break;
|
|
||||||
case UNCHANGED:
|
|
||||||
case FRAGMENT:
|
|
||||||
markChecked(key, value);
|
|
||||||
break;
|
|
||||||
case AWAIT_CONFIRMATION:
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void markChecked(String key, String value)
|
|
||||||
{
|
|
||||||
mChecked.put(key, new Checked(value, System.currentTimeMillis()));
|
|
||||||
mCandidates.remove(key);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Compares the decoded talker alias with the stored alias name.
|
|
||||||
* @param stored alias name, normalized, or null
|
|
||||||
* @param decoded talker alias, normalized
|
|
||||||
* @param confirmations number of consecutive decodes of the talker alias
|
|
||||||
* @return decision
|
|
||||||
*/
|
|
||||||
@VisibleForTesting
|
|
||||||
static Decision decide(String stored, String decoded, int confirmations)
|
|
||||||
{
|
|
||||||
if(stored == null || stored.isEmpty())
|
|
||||||
{
|
|
||||||
return Decision.UPDATE;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(stored.equals(decoded))
|
|
||||||
{
|
|
||||||
return Decision.UNCHANGED;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(isFragment(decoded, stored))
|
|
||||||
{
|
|
||||||
return Decision.FRAGMENT;
|
|
||||||
}
|
|
||||||
|
|
||||||
//A longer version of a stored fragment.
|
|
||||||
if(isFragment(stored, decoded) && !hasUndecodableCharacters(decoded))
|
|
||||||
{
|
|
||||||
return Decision.UPDATE;
|
|
||||||
}
|
|
||||||
|
|
||||||
//A different alias that may be a corrupted or mis-assembled alias. It's replaced only once confirmed, and an
|
|
||||||
//alias that has undecodable characters (e.g. a partial multi-byte character) never replaces a stored alias.
|
|
||||||
if(confirmations >= CONFIRMATIONS_REQUIRED && !hasUndecodableCharacters(decoded))
|
|
||||||
{
|
|
||||||
return Decision.UPDATE;
|
|
||||||
}
|
|
||||||
|
|
||||||
return Decision.AWAIT_CONFIRMATION;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Indicates if the value is a fragment (the leading characters) of the full value.
|
|
||||||
*/
|
|
||||||
@VisibleForTesting
|
|
||||||
static boolean isFragment(String value, String full)
|
|
||||||
{
|
|
||||||
return value != null && full != null && value.length() < full.length() && full.startsWith(value);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static boolean hasUndecodableCharacters(String value)
|
|
||||||
{
|
|
||||||
return value.indexOf('<27>') >= 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Removes padding, control characters and trailing undecodable characters (e.g. from a partial multi-byte
|
|
||||||
* character at the end of an alias fragment) from the talker alias.
|
|
||||||
* @param value to normalize
|
|
||||||
* @return normalized value or null if the value is empty.
|
|
||||||
*/
|
|
||||||
@VisibleForTesting
|
|
||||||
static String normalize(String value)
|
|
||||||
{
|
|
||||||
if(value == null)
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
StringBuilder sb = new StringBuilder(value.length());
|
|
||||||
|
|
||||||
for(int i = 0; i < value.length(); i++)
|
|
||||||
{
|
|
||||||
char c = value.charAt(i);
|
|
||||||
|
|
||||||
if(!Character.isISOControl(c))
|
|
||||||
{
|
|
||||||
sb.append(c);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
int end = sb.length();
|
|
||||||
|
|
||||||
while(end > 0 && (sb.charAt(end - 1) == '<27>' || Character.isWhitespace(sb.charAt(end - 1))))
|
|
||||||
{
|
|
||||||
end--;
|
|
||||||
}
|
|
||||||
|
|
||||||
String normalized = sb.substring(0, end).trim();
|
|
||||||
return normalized.isEmpty() ? null : normalized;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a radio alias identifier that exactly matches the radio.
|
|
||||||
* @param radio identifier
|
|
||||||
* @return alias identifier or null if the radio protocol isn't known.
|
|
||||||
*/
|
|
||||||
@VisibleForTesting
|
|
||||||
static Radio createAliasId(RadioIdentifier radio)
|
|
||||||
{
|
|
||||||
if(radio instanceof FullyQualifiedRadioIdentifier fqri && fqri.getProtocol() == Protocol.APCO25)
|
|
||||||
{
|
|
||||||
return new P25FullyQualifiedRadio(fqri.getWacn(), fqri.getSystem(), fqri.getRadio());
|
|
||||||
}
|
|
||||||
|
|
||||||
if(radio instanceof NXDNRadioIdentifier nxdn && nxdn.isTypeD())
|
|
||||||
{
|
|
||||||
return new NXDNTypeDRadio(nxdn.getTypeDHomeRepeater(), nxdn.getTypeDRadio());
|
|
||||||
}
|
|
||||||
|
|
||||||
Protocol protocol = radio.getProtocol();
|
|
||||||
|
|
||||||
if(protocol == null || protocol == Protocol.UNKNOWN || radio.getValue() == null)
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
return new Radio(protocol, radio.getValue());
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Finds the alias that has an identifier that exactly matches the radio (i.e. not a radio range).
|
|
||||||
*/
|
|
||||||
@VisibleForTesting
|
|
||||||
static Alias findExactMatch(List<Alias> aliases, Radio aliasId)
|
|
||||||
{
|
|
||||||
if(aliases != null)
|
|
||||||
{
|
|
||||||
for(Alias alias: aliases)
|
|
||||||
{
|
|
||||||
for(AliasID id: alias.getAliasIdentifiers())
|
|
||||||
{
|
|
||||||
if(isExactMatch(id, aliasId))
|
|
||||||
{
|
|
||||||
return alias;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static boolean isExactMatch(AliasID id, Radio aliasId)
|
|
||||||
{
|
|
||||||
if(aliasId instanceof P25FullyQualifiedRadio target)
|
|
||||||
{
|
|
||||||
return id instanceof P25FullyQualifiedRadio fqr && fqr.getHashKey().equals(target.getHashKey());
|
|
||||||
}
|
|
||||||
|
|
||||||
return id instanceof Radio radio && !(id instanceof P25FullyQualifiedRadio) &&
|
|
||||||
radio.getProtocol() == aliasId.getProtocol() && radio.getValue() == aliasId.getValue();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Number of identifiers (e.g. radios, talkgroups) in the alias, excluding audio settings like priority, record and
|
|
||||||
* streaming.
|
|
||||||
*/
|
|
||||||
private static int getIdentityCount(Alias alias)
|
|
||||||
{
|
|
||||||
int count = 0;
|
|
||||||
|
|
||||||
for(AliasID id: alias.getAliasIdentifiers())
|
|
||||||
{
|
|
||||||
if(!id.isAudioIdentifier())
|
|
||||||
{
|
|
||||||
count++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return count;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static String getKey(Radio aliasId)
|
|
||||||
{
|
|
||||||
if(aliasId instanceof P25FullyQualifiedRadio fqr)
|
|
||||||
{
|
|
||||||
return aliasId.getProtocol() + ":" + fqr.getHashKey();
|
|
||||||
}
|
|
||||||
|
|
||||||
return aliasId.getProtocol() + ":" + aliasId.getValue();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Runs on the FX thread, or on this thread when the FX toolkit isn't running (headless).
|
|
||||||
*/
|
|
||||||
private static void runOnFxThread(Runnable runnable)
|
|
||||||
{
|
|
||||||
if(Platform.isFxApplicationThread())
|
|
||||||
{
|
|
||||||
runnable.run();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
Platform.runLater(runnable);
|
|
||||||
}
|
|
||||||
catch(IllegalStateException ise)
|
|
||||||
{
|
|
||||||
runnable.run();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private record Candidate(String value, int count) {}
|
|
||||||
private record Checked(String value, long timestamp) {}
|
|
||||||
}
|
|
||||||
@@ -49,7 +49,6 @@ public class ChannelMetadata implements Listener<IdentifierUpdateNotification>,
|
|||||||
{
|
{
|
||||||
private final static Logger mLog = LoggerFactory.getLogger(ChannelMetadata.class);
|
private final static Logger mLog = LoggerFactory.getLogger(ChannelMetadata.class);
|
||||||
|
|
||||||
private AliasListConfigurationIdentifier mAliasListConfigurationIdentifier;
|
|
||||||
private SystemConfigurationIdentifier mSystemConfigurationIdentifier;
|
private SystemConfigurationIdentifier mSystemConfigurationIdentifier;
|
||||||
private SiteConfigurationIdentifier mSiteConfigurationIdentifier;
|
private SiteConfigurationIdentifier mSiteConfigurationIdentifier;
|
||||||
private ChannelNameConfigurationIdentifier mChannelNameConfigurationIdentifier;
|
private ChannelNameConfigurationIdentifier mChannelNameConfigurationIdentifier;
|
||||||
@@ -129,19 +128,6 @@ public class ChannelMetadata implements Listener<IdentifierUpdateNotification>,
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Alias list configuration identifier
|
|
||||||
*/
|
|
||||||
public AliasListConfigurationIdentifier getAliasListConfigurationIdentifier()
|
|
||||||
{
|
|
||||||
return mAliasListConfigurationIdentifier;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean hasAliasListConfigurationIdentifier()
|
|
||||||
{
|
|
||||||
return mAliasListConfigurationIdentifier != null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* System configuration identifier
|
* System configuration identifier
|
||||||
*/
|
*/
|
||||||
@@ -337,15 +323,6 @@ public class ChannelMetadata implements Listener<IdentifierUpdateNotification>,
|
|||||||
switch(identifier.getForm())
|
switch(identifier.getForm())
|
||||||
{
|
{
|
||||||
case ALIAS_LIST:
|
case ALIAS_LIST:
|
||||||
if(identifier instanceof AliasListConfigurationIdentifier && (update.isAdd() || update.isSilentAdd()))
|
|
||||||
{
|
|
||||||
mAliasListConfigurationIdentifier = (AliasListConfigurationIdentifier)identifier;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
mAliasListConfigurationIdentifier = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(update.isAdd())
|
if(update.isAdd())
|
||||||
{
|
{
|
||||||
mAliasList = mAliasModel.getAliasList((AliasListConfigurationIdentifier)identifier);
|
mAliasList = mAliasModel.getAliasList((AliasListConfigurationIdentifier)identifier);
|
||||||
@@ -362,7 +339,6 @@ public class ChannelMetadata implements Listener<IdentifierUpdateNotification>,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
broadcastUpdate(ChannelMetadataField.CONFIGURATION_ALIAS_LIST);
|
|
||||||
break;
|
break;
|
||||||
case CHANNEL:
|
case CHANNEL:
|
||||||
if(identifier instanceof ChannelNameConfigurationIdentifier && (update.isAdd() || update.isSilentAdd()))
|
if(identifier instanceof ChannelNameConfigurationIdentifier && (update.isAdd() || update.isSilentAdd()))
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ package io.github.dsheirer.channel.metadata;
|
|||||||
|
|
||||||
public enum ChannelMetadataField
|
public enum ChannelMetadataField
|
||||||
{
|
{
|
||||||
CONFIGURATION_ALIAS_LIST,
|
|
||||||
CONFIGURATION_CHANNEL,
|
CONFIGURATION_CHANNEL,
|
||||||
CONFIGURATION_FREQUENCY,
|
CONFIGURATION_FREQUENCY,
|
||||||
CONFIGURATION_SITE,
|
CONFIGURATION_SITE,
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ import io.github.dsheirer.gui.nowplaying.NowPlayingPanel;
|
|||||||
import io.github.dsheirer.gui.playlist.ViewPlaylistRequest;
|
import io.github.dsheirer.gui.playlist.ViewPlaylistRequest;
|
||||||
import io.github.dsheirer.icon.IconModel;
|
import io.github.dsheirer.icon.IconModel;
|
||||||
import io.github.dsheirer.gui.playlist.radioreference.RadioReferencePlaylistActions;
|
import io.github.dsheirer.gui.playlist.radioreference.RadioReferencePlaylistActions;
|
||||||
import io.github.dsheirer.gui.map.MapPanel;
|
import io.github.dsheirer.map.MapPanel;
|
||||||
import io.github.dsheirer.map.MapService;
|
import io.github.dsheirer.map.MapService;
|
||||||
import io.github.dsheirer.playlist.PlaylistManager;
|
import io.github.dsheirer.playlist.PlaylistManager;
|
||||||
import io.github.dsheirer.preference.UserPreferences;
|
import io.github.dsheirer.preference.UserPreferences;
|
||||||
@@ -64,7 +64,7 @@ public class ControllerPanel extends JPanel
|
|||||||
mAudioPanel = new AudioPanel(iconModel, userPreferences, settingsManager, audioPlaybackManager,
|
mAudioPanel = new AudioPanel(iconModel, userPreferences, settingsManager, audioPlaybackManager,
|
||||||
playlistManager.getAliasModel());
|
playlistManager.getAliasModel());
|
||||||
mNowPlayingPanel = new NowPlayingPanel(playlistManager, iconModel, userPreferences, detailTabsVisible);
|
mNowPlayingPanel = new NowPlayingPanel(playlistManager, iconModel, userPreferences, detailTabsVisible);
|
||||||
mMapPanel = new MapPanel(mapService, iconModel, userPreferences,
|
mMapPanel = new MapPanel(mapService, playlistManager.getAliasModel(), iconModel, userPreferences,
|
||||||
playlistManager.getRadioReference() != null ? playlistManager.getRadioReference().getFrequencyIndex() : null,
|
playlistManager.getRadioReference() != null ? playlistManager.getRadioReference().getFrequencyIndex() : null,
|
||||||
new RadioReferencePlaylistActions(playlistManager));
|
new RadioReferencePlaylistActions(playlistManager));
|
||||||
mTunerManagerPanel = new TunerViewPanel(tunerManager, userPreferences);
|
mTunerManagerPanel = new TunerViewPanel(tunerManager, userPreferences);
|
||||||
|
|||||||
@@ -18,7 +18,6 @@
|
|||||||
*/
|
*/
|
||||||
package io.github.dsheirer.controller.channel;
|
package io.github.dsheirer.controller.channel;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
|
||||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||||
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
|
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
|
||||||
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
|
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
|
||||||
@@ -84,8 +83,6 @@ public class Channel extends Configuration implements Listener<SourceEvent>
|
|||||||
|
|
||||||
private BooleanProperty mProcessing = new SimpleBooleanProperty();
|
private BooleanProperty mProcessing = new SimpleBooleanProperty();
|
||||||
private BooleanProperty mAutoStart = new SimpleBooleanProperty();
|
private BooleanProperty mAutoStart = new SimpleBooleanProperty();
|
||||||
//Enabled for new channels. Channels loaded from a playlist without the setting keep it disabled, see fromXml().
|
|
||||||
private BooleanProperty mAutoAddTalkerAliases = new SimpleBooleanProperty(true);
|
|
||||||
private IntegerProperty mAutoStartOrder = new SimpleIntegerProperty();
|
private IntegerProperty mAutoStartOrder = new SimpleIntegerProperty();
|
||||||
private boolean mSelected;
|
private boolean mSelected;
|
||||||
private List<TunerChannel> mTunerChannels = null;
|
private List<TunerChannel> mTunerChannels = null;
|
||||||
@@ -126,19 +123,6 @@ public class Channel extends Configuration implements Listener<SourceEvent>
|
|||||||
mChannelID = UNIQUE_ID++;
|
mChannelID = UNIQUE_ID++;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a channel for deserialization from a playlist. Settings added after a channel was saved take their
|
|
||||||
* legacy (disabled) value when the playlist doesn't specify them, instead of the default for new channels, so that
|
|
||||||
* existing channels don't change behavior.
|
|
||||||
*/
|
|
||||||
@JsonCreator
|
|
||||||
private static Channel fromXml()
|
|
||||||
{
|
|
||||||
Channel channel = new Channel();
|
|
||||||
channel.setAutoAddTalkerAliases(false);
|
|
||||||
return channel;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a (new) deep copy of this channel
|
* Creates a (new) deep copy of this channel
|
||||||
*/
|
*/
|
||||||
@@ -150,7 +134,6 @@ public class Channel extends Configuration implements Listener<SourceEvent>
|
|||||||
channel.setAliasListName(mAliasListName.get());
|
channel.setAliasListName(mAliasListName.get());
|
||||||
channel.setAutoStart(mAutoStart.get());
|
channel.setAutoStart(mAutoStart.get());
|
||||||
channel.setAutoStartOrder(mAutoStartOrder.get());
|
channel.setAutoStartOrder(mAutoStartOrder.get());
|
||||||
channel.setAutoAddTalkerAliases(mAutoAddTalkerAliases.get());
|
|
||||||
|
|
||||||
AuxDecodeConfiguration auxCopy = new AuxDecodeConfiguration();
|
AuxDecodeConfiguration auxCopy = new AuxDecodeConfiguration();
|
||||||
|
|
||||||
@@ -526,36 +509,6 @@ public class Channel extends Configuration implements Listener<SourceEvent>
|
|||||||
mAutoStart.set(autoStart);
|
mAutoStart.set(autoStart);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Auto-add talker aliases property
|
|
||||||
*/
|
|
||||||
public BooleanProperty autoAddTalkerAliasesProperty()
|
|
||||||
{
|
|
||||||
return mAutoAddTalkerAliases;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Indicates if decoded talker aliases are automatically added to the channel's alias list as radio aliases, using
|
|
||||||
* the talker alias as the alias name.
|
|
||||||
*
|
|
||||||
* @return true if talker aliases are automatically added to the alias list
|
|
||||||
*/
|
|
||||||
@JacksonXmlProperty(isAttribute = true, localName = "auto_add_talker_aliases")
|
|
||||||
public boolean isAutoAddTalkerAliases()
|
|
||||||
{
|
|
||||||
return mAutoAddTalkerAliases.get();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets automatically adding decoded talker aliases to the channel's alias list.
|
|
||||||
*
|
|
||||||
* @param autoAdd true to automatically add talker aliases to the alias list
|
|
||||||
*/
|
|
||||||
public void setAutoAddTalkerAliases(boolean autoAdd)
|
|
||||||
{
|
|
||||||
mAutoAddTalkerAliases.set(autoAdd);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Auto-start order. Specifies an optional ordering for channels so that when the application starts up,
|
* Auto-start order. Specifies an optional ordering for channels so that when the application starts up,
|
||||||
* the channels can be started in a user-specified order.
|
* the channels can be started in a user-specified order.
|
||||||
|
|||||||
@@ -79,11 +79,9 @@ public class ComplexPolyphaseChannelizerM2 extends AbstractComplexPolyphaseChann
|
|||||||
private static final int MAXIMUM_QUEUED_BATCHES = 50;
|
private static final int MAXIMUM_QUEUED_BATCHES = 50;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Maximum batch sample arrays held for reuse: the queued IFFT batches plus the batch being filled and the batch
|
* Maximum batch sample arrays held for reuse: the queued IFFT batches plus the batches queued for channel output.
|
||||||
* being transformed. Channel output processors copy their channels from a batch instead of retaining it, so no
|
|
||||||
* other batches are held.
|
|
||||||
*/
|
*/
|
||||||
private static final int MAXIMUM_POOLED_BATCHES = MAXIMUM_QUEUED_BATCHES + 2;
|
private static final int MAXIMUM_POOLED_BATCHES = 2 * MAXIMUM_QUEUED_BATCHES;
|
||||||
|
|
||||||
//Sized to process 40 times per second
|
//Sized to process 40 times per second
|
||||||
private IFFTProcessorDispatcher mIFFTProcessorDispatcher = new IFFTProcessorDispatcher(25);
|
private IFFTProcessorDispatcher mIFFTProcessorDispatcher = new IFFTProcessorDispatcher(25);
|
||||||
|
|||||||
@@ -68,12 +68,7 @@ public class PolyphaseChannelManager implements ISourceEventProcessor
|
|||||||
private final static Logger mLog = LoggerFactory.getLogger(PolyphaseChannelManager.class);
|
private final static Logger mLog = LoggerFactory.getLogger(PolyphaseChannelManager.class);
|
||||||
private static final double CHANNEL_OVERSAMPLING = 2.0;
|
private static final double CHANNEL_OVERSAMPLING = 2.0;
|
||||||
private static final int POLYPHASE_CHANNELIZER_TAPS_PER_CHANNEL = 9;
|
private static final int POLYPHASE_CHANNELIZER_TAPS_PER_CHANNEL = 9;
|
||||||
/**
|
private static final int MAXIMUM_QUEUED_NATIVE_BUFFERS = 500;
|
||||||
* Maximum duration of queued native buffers awaiting the channelizer. The queue is bounded by sample count instead
|
|
||||||
* of buffer count because tuner buffer sizes vary widely, for example about 1,000 samples per RSP buffer and 32,768
|
|
||||||
* samples per RTL-SDR buffer, so that each tuner can absorb a processing delay of the same duration.
|
|
||||||
*/
|
|
||||||
private static final double MAXIMUM_QUEUED_SECONDS = 1.0;
|
|
||||||
|
|
||||||
private Broadcaster<SourceEvent> mSourceEventBroadcaster = new Broadcaster<>();
|
private Broadcaster<SourceEvent> mSourceEventBroadcaster = new Broadcaster<>();
|
||||||
private TunerController mTunerController;
|
private TunerController mTunerController;
|
||||||
@@ -83,7 +78,7 @@ public class PolyphaseChannelManager implements ISourceEventProcessor
|
|||||||
private ComplexPolyphaseChannelizerM2 mPolyphaseChannelizer;
|
private ComplexPolyphaseChannelizerM2 mPolyphaseChannelizer;
|
||||||
private ChannelSourceEventListener mChannelSourceEventListener = new ChannelSourceEventListener();
|
private ChannelSourceEventListener mChannelSourceEventListener = new ChannelSourceEventListener();
|
||||||
private NativeBufferReceiver mNativeBufferReceiver = new NativeBufferReceiver();
|
private NativeBufferReceiver mNativeBufferReceiver = new NativeBufferReceiver();
|
||||||
private Dispatcher<INativeBuffer> mBufferDispatcher;
|
private Dispatcher mBufferDispatcher;
|
||||||
private boolean mRunning = true;
|
private boolean mRunning = true;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -104,21 +99,10 @@ public class PolyphaseChannelManager implements ISourceEventProcessor
|
|||||||
|
|
||||||
mChannelCalculator = new ChannelCalculator(tunerController.getSampleRate(), channelCount,
|
mChannelCalculator = new ChannelCalculator(tunerController.getSampleRate(), channelCount,
|
||||||
tunerController.getFrequency(), CHANNEL_OVERSAMPLING);
|
tunerController.getFrequency(), CHANNEL_OVERSAMPLING);
|
||||||
mBufferDispatcher = new Dispatcher<>("sdrtrunk polyphase buffer processor", 10, INativeBuffer::sampleCount,
|
mBufferDispatcher = new Dispatcher("sdrtrunk polyphase buffer processor", 10, MAXIMUM_QUEUED_NATIVE_BUFFERS);
|
||||||
getMaximumQueuedSamples(tunerController.getSampleRate()));
|
|
||||||
mBufferDispatcher.setListener(mNativeBufferReceiver);
|
mBufferDispatcher.setListener(mNativeBufferReceiver);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Calculates the maximum number of queued samples for the buffer dispatcher.
|
|
||||||
* @param sampleRate of the tuner
|
|
||||||
* @return maximum queued samples, at least one
|
|
||||||
*/
|
|
||||||
private static long getMaximumQueuedSamples(double sampleRate)
|
|
||||||
{
|
|
||||||
return Math.max(1, (long)(sampleRate * MAXIMUM_QUEUED_SECONDS));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Provides a description of the state of this manager.
|
* Provides a description of the state of this manager.
|
||||||
*/
|
*/
|
||||||
@@ -294,7 +278,6 @@ public class PolyphaseChannelManager implements ISourceEventProcessor
|
|||||||
double sampleRate = sourceEvent.getValue().doubleValue();
|
double sampleRate = sourceEvent.getValue().doubleValue();
|
||||||
int channelCount = ComplexPolyphaseChannelizerM2.getChannelCount(sampleRate);
|
int channelCount = ComplexPolyphaseChannelizerM2.getChannelCount(sampleRate);
|
||||||
mChannelCalculator.setRates(sampleRate, channelCount);
|
mChannelCalculator.setRates(sampleRate, channelCount);
|
||||||
mBufferDispatcher.setMaximumQueuedWeight(getMaximumQueuedSamples(sampleRate));
|
|
||||||
break;
|
break;
|
||||||
case NOTIFICATION_FREQUENCY_AND_SAMPLE_RATE_LOCKED:
|
case NOTIFICATION_FREQUENCY_AND_SAMPLE_RATE_LOCKED:
|
||||||
case NOTIFICATION_FREQUENCY_AND_SAMPLE_RATE_UNLOCKED:
|
case NOTIFICATION_FREQUENCY_AND_SAMPLE_RATE_UNLOCKED:
|
||||||
|
|||||||
@@ -180,8 +180,7 @@ public class PolyphaseChannelSource extends TunerChannelSource implements Listen
|
|||||||
/**
|
/**
|
||||||
* Performs the output processor update. This method must be invoked on the channel results calling thread so that
|
* Performs the output processor update. This method must be invoked on the channel results calling thread so that
|
||||||
* replacing the output processor doesn't overlap with delivery of channel results to it. The output processor
|
* replacing the output processor doesn't overlap with delivery of channel results to it. The output processor
|
||||||
* applies channel index changes as it copies the next batch, and applies mixer and filter changes on its own
|
* applies the configuration changes on its own dispatcher thread.
|
||||||
* dispatcher thread at that same batch.
|
|
||||||
* @param channelCalculator for updates
|
* @param channelCalculator for updates
|
||||||
* @param filterManager for updates
|
* @param filterManager for updates
|
||||||
* @throws IllegalArgumentException if there's an issue.
|
* @throws IllegalArgumentException if there's an issue.
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* *****************************************************************************
|
* *****************************************************************************
|
||||||
* Copyright (C) 2014-2026 Dennis Sheirer
|
* Copyright (C) 2014-2024 Dennis Sheirer
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -24,7 +24,6 @@ import io.github.dsheirer.sample.complex.ComplexSamples;
|
|||||||
import io.github.dsheirer.source.heartbeat.HeartbeatManager;
|
import io.github.dsheirer.source.heartbeat.HeartbeatManager;
|
||||||
import io.github.dsheirer.util.Dispatcher;
|
import io.github.dsheirer.util.Dispatcher;
|
||||||
import java.util.Queue;
|
import java.util.Queue;
|
||||||
import java.util.concurrent.ArrayBlockingQueue;
|
|
||||||
import java.util.concurrent.ConcurrentLinkedQueue;
|
import java.util.concurrent.ConcurrentLinkedQueue;
|
||||||
import java.util.concurrent.atomic.AtomicLong;
|
import java.util.concurrent.atomic.AtomicLong;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
@@ -35,20 +34,12 @@ public abstract class ChannelOutputProcessor implements IPolyphaseChannelOutputP
|
|||||||
private final static Logger mLog = LoggerFactory.getLogger(ChannelOutputProcessor.class);
|
private final static Logger mLog = LoggerFactory.getLogger(ChannelOutputProcessor.class);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Maximum queued channel sample batches, about one second of samples. A full batch is dropped when this channel
|
* Maximum queued channel results batches, about one second of samples. A full batch is dropped when this channel
|
||||||
* falls behind, which preserves the even-sized batch block parity that two-channel synthesis relies on.
|
* falls behind, which preserves the even-sized batch block parity that two-channel synthesis relies on.
|
||||||
*/
|
*/
|
||||||
private static final int MAXIMUM_QUEUED_BATCHES = 50;
|
private static final int MAXIMUM_QUEUED_BATCHES = 50;
|
||||||
|
|
||||||
/**
|
private Dispatcher<QueuedChannelResults> mChannelResultsDispatcher;
|
||||||
* Maximum channel sample arrays held for reuse: the queued batches plus the batch being processed and the batch
|
|
||||||
* being copied.
|
|
||||||
*/
|
|
||||||
private static final int MAXIMUM_POOLED_ARRAYS = MAXIMUM_QUEUED_BATCHES + 2;
|
|
||||||
|
|
||||||
private Dispatcher<QueuedChannelSamples> mChannelSamplesDispatcher;
|
|
||||||
private final Queue<float[]> mSamplePool = new ArrayBlockingQueue<>(MAXIMUM_POOLED_ARRAYS);
|
|
||||||
private volatile int[] mChannelOffsets = new int[0];
|
|
||||||
private final Queue<PendingUpdate> mPendingUpdates = new ConcurrentLinkedQueue<>();
|
private final Queue<PendingUpdate> mPendingUpdates = new ConcurrentLinkedQueue<>();
|
||||||
private final AtomicLong mBatchSequence = new AtomicLong();
|
private final AtomicLong mBatchSequence = new AtomicLong();
|
||||||
private HeartbeatManager mHeartbeatManager;
|
private HeartbeatManager mHeartbeatManager;
|
||||||
@@ -69,45 +60,25 @@ public abstract class ChannelOutputProcessor implements IPolyphaseChannelOutputP
|
|||||||
mInputChannelCount = inputChannelCount;
|
mInputChannelCount = inputChannelCount;
|
||||||
//Process 1/10th of the sample rate per second at a rate of 20 times a second (200% of anticipated rate)
|
//Process 1/10th of the sample rate per second at a rate of 20 times a second (200% of anticipated rate)
|
||||||
mHeartbeatManager = heartbeatManager;
|
mHeartbeatManager = heartbeatManager;
|
||||||
mChannelSamplesDispatcher = new Dispatcher<>(threadName,50, mHeartbeatManager, MAXIMUM_QUEUED_BATCHES);
|
mChannelResultsDispatcher = new Dispatcher(threadName,50, mHeartbeatManager, MAXIMUM_QUEUED_BATCHES);
|
||||||
mChannelSamplesDispatcher.setListener(queued -> {
|
mChannelResultsDispatcher.setListener(queued -> {
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
applyPendingUpdates(queued.sequence());
|
applyPendingUpdates(queued.sequence());
|
||||||
mCurrentSampleTimestamp = queued.timestamp();
|
mCurrentSampleTimestamp = queued.channelResults().getTimestamp();
|
||||||
process(queued.samples(), queued.blockCount());
|
process(queued.channelResults());
|
||||||
}
|
}
|
||||||
catch(Throwable t)
|
catch(Throwable t)
|
||||||
{
|
{
|
||||||
mLog.error("Error processing channel samples", t);
|
mLog.error("Error processing channel results", t);
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
{
|
{
|
||||||
mSamplePool.offer(queued.samples());
|
queued.channelResults().release();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets the I/Q offsets within each channel results block for the polyphase channel(s) that this processor copies.
|
|
||||||
* The offsets take effect at the first channel results batch received after this method is invoked, the same as a
|
|
||||||
* change queued with enqueueUpdate(), so a change of offsets and of the mixer frequency apply to the same batch.
|
|
||||||
* This should only be invoked on the thread that delivers channel results, or before results are delivered.
|
|
||||||
* @param offsets for each polyphase channel, which is twice the channel index.
|
|
||||||
*/
|
|
||||||
protected void setChannelOffsets(int... offsets)
|
|
||||||
{
|
|
||||||
mChannelOffsets = offsets.clone();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Current I/Q offsets within each channel results block for the polyphase channel(s) that this processor copies.
|
|
||||||
*/
|
|
||||||
protected int[] getChannelOffsets()
|
|
||||||
{
|
|
||||||
return mChannelOffsets.clone();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Queues a configuration change to apply on the dispatcher thread, so that configuration changes don't overlap with
|
* Queues a configuration change to apply on the dispatcher thread, so that configuration changes don't overlap with
|
||||||
* sample processing. The change takes effect at the first channel results batch received after this method is
|
* sample processing. The change takes effect at the first channel results batch received after this method is
|
||||||
@@ -148,13 +119,13 @@ public abstract class ChannelOutputProcessor implements IPolyphaseChannelOutputP
|
|||||||
@Override
|
@Override
|
||||||
public void start()
|
public void start()
|
||||||
{
|
{
|
||||||
mChannelSamplesDispatcher.start();
|
mChannelResultsDispatcher.start();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void stop()
|
public void stop()
|
||||||
{
|
{
|
||||||
mChannelSamplesDispatcher.stop();
|
mChannelResultsDispatcher.stop();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -176,66 +147,22 @@ public abstract class ChannelOutputProcessor implements IPolyphaseChannelOutputP
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Copies this processor's polyphase channel(s) from the channel results batch and queues the copy for processing on
|
|
||||||
* the dispatcher thread. The copy is small (about 8 kB per polyphase channel for a 1024 block batch), so the batch
|
|
||||||
* isn't retained beyond this method and its large shared sample array returns to the channelizer's pool as soon as
|
|
||||||
* the channelizer has dispatched it to every channel. A slow channel then queues only its own samples.
|
|
||||||
*
|
|
||||||
* @param channelResults batch to copy from
|
|
||||||
*/
|
|
||||||
@Override
|
@Override
|
||||||
public void receiveChannelResults(ChannelResultsBatch channelResults)
|
public void receiveChannelResults(ChannelResultsBatch channelResults)
|
||||||
{
|
{
|
||||||
long sequence = mBatchSequence.incrementAndGet();
|
channelResults.retain();
|
||||||
|
|
||||||
if(!mChannelSamplesDispatcher.isRunning())
|
if(!mChannelResultsDispatcher.offer(new QueuedChannelResults(channelResults, mBatchSequence.incrementAndGet())))
|
||||||
{
|
{
|
||||||
return;
|
channelResults.release();
|
||||||
}
|
|
||||||
|
|
||||||
int[] offsets = mChannelOffsets;
|
|
||||||
float[] source = channelResults.getSamples();
|
|
||||||
int blockLength = channelResults.getBlockLength();
|
|
||||||
int blockCount = channelResults.getBlockCount();
|
|
||||||
float[] samples = getPooledArray(blockCount * offsets.length * 2);
|
|
||||||
int pointer = 0;
|
|
||||||
|
|
||||||
for(int block = 0; block < blockCount; block++)
|
|
||||||
{
|
|
||||||
int blockOffset = block * blockLength;
|
|
||||||
|
|
||||||
for(int offset : offsets)
|
|
||||||
{
|
|
||||||
samples[pointer++] = source[blockOffset + offset];
|
|
||||||
samples[pointer++] = source[blockOffset + offset + 1];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(!mChannelSamplesDispatcher.offer(new QueuedChannelSamples(samples, blockCount, channelResults.getTimestamp(),
|
|
||||||
sequence)))
|
|
||||||
{
|
|
||||||
mSamplePool.offer(samples);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Provides a reused sample array of the requested length when one is available, or a new array.
|
* Sub-class implementation to process one polyphase channelizer results batch.
|
||||||
|
* @param channelResults to process
|
||||||
*/
|
*/
|
||||||
private float[] getPooledArray(int length)
|
public abstract void process(ChannelResultsBatch channelResults);
|
||||||
{
|
|
||||||
float[] samples = mSamplePool.poll();
|
|
||||||
return samples != null && samples.length == length ? samples : new float[length];
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sub-class implementation to process one batch of copied channel samples.
|
|
||||||
* @param samples for each block in order, with the I/Q pair of each polyphase channel in the order of the channel
|
|
||||||
* offsets, for example I1,Q1,I2,Q2 per block for two channels.
|
|
||||||
* @param blockCount number of blocks. Batches start on an even block index, so the index of a block within this
|
|
||||||
* batch has the same parity as its absolute block index.
|
|
||||||
*/
|
|
||||||
public abstract void process(float[] samples, int blockCount);
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getInputChannelCount()
|
public int getInputChannelCount()
|
||||||
@@ -244,10 +171,9 @@ public abstract class ChannelOutputProcessor implements IPolyphaseChannelOutputP
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Copied channel samples with the timestamp of the batch they were copied from and the batch's position in the
|
* Channel results batch and its position in the sequence of received batches.
|
||||||
* sequence of received batches.
|
|
||||||
*/
|
*/
|
||||||
private record QueuedChannelSamples(float[] samples, int blockCount, long timestamp, long sequence) {}
|
private record QueuedChannelResults(ChannelResultsBatch channelResults, long sequence) {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Configuration change and the sequence number of the last batch received before the change was requested.
|
* Configuration change and the sequence number of the last batch received before the change was requested.
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* *****************************************************************************
|
* *****************************************************************************
|
||||||
* Copyright (C) 2014-2026 Dennis Sheirer
|
* Copyright (C) 2014-2024 Dennis Sheirer
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -18,9 +18,9 @@
|
|||||||
*/
|
*/
|
||||||
package io.github.dsheirer.dsp.filter.channelizer.output;
|
package io.github.dsheirer.dsp.filter.channelizer.output;
|
||||||
|
|
||||||
|
import io.github.dsheirer.dsp.filter.channelizer.ChannelResultsBatch;
|
||||||
import io.github.dsheirer.sample.complex.ComplexSamples;
|
import io.github.dsheirer.sample.complex.ComplexSamples;
|
||||||
import io.github.dsheirer.source.heartbeat.HeartbeatManager;
|
import io.github.dsheirer.source.heartbeat.HeartbeatManager;
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
@@ -29,6 +29,7 @@ public class OneChannelOutputProcessor extends ChannelOutputProcessor
|
|||||||
{
|
{
|
||||||
private final static Logger mLog = LoggerFactory.getLogger(OneChannelOutputProcessor.class);
|
private final static Logger mLog = LoggerFactory.getLogger(OneChannelOutputProcessor.class);
|
||||||
private final OneChannelMixerAssembler mMixerAssembler;
|
private final OneChannelMixerAssembler mMixerAssembler;
|
||||||
|
private int mChannelOffset;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Processor to extract a single channel from a polyphase channelizer and produce an output I/Q complex sample
|
* Processor to extract a single channel from a polyphase channelizer and produce an output I/Q complex sample
|
||||||
@@ -54,7 +55,7 @@ public class OneChannelOutputProcessor extends ChannelOutputProcessor
|
|||||||
{
|
{
|
||||||
StringBuilder sb = new StringBuilder();
|
StringBuilder sb = new StringBuilder();
|
||||||
sb.append("One Channel Output Processor");
|
sb.append("One Channel Output Processor");
|
||||||
sb.append("\n\tIndex (doubled) ").append(Arrays.toString(getChannelOffsets()));
|
sb.append("\n\tIndex (doubled) [").append(mChannelOffset).append("]");
|
||||||
sb.append("\n\tMixer Assembler: none");
|
sb.append("\n\tMixer Assembler: none");
|
||||||
return sb.toString();
|
return sb.toString();
|
||||||
}
|
}
|
||||||
@@ -80,7 +81,8 @@ public class OneChannelOutputProcessor extends ChannelOutputProcessor
|
|||||||
|
|
||||||
//Set the channelized output results offset to twice the channel index to account for each channel having
|
//Set the channelized output results offset to twice the channel index to account for each channel having
|
||||||
//an I/Q pair
|
//an I/Q pair
|
||||||
setChannelOffsets(indexes.get(0) * 2);
|
int channelOffset = indexes.get(0) * 2;
|
||||||
|
enqueueUpdate(() -> mChannelOffset = channelOffset);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -90,18 +92,19 @@ public class OneChannelOutputProcessor extends ChannelOutputProcessor
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Passes the copied channel samples to the assembler. The assembler will apply frequency translation and gain and
|
* Extract the channel from the channel results array and pass to the assembler. The assembler will
|
||||||
* indicate when a buffer is fully assembled.
|
* apply frequency translation and gain and indicate when a buffer is fully assembled.
|
||||||
*
|
*
|
||||||
* @param samples containing an I/Q pair for each block (I0,Q0,I1,Q1...In,Qn)
|
* @param channelResults to process containing blocks of channel I/Q sample pairs (I0,Q0,I1,Q1...In,Qn)
|
||||||
* @param blockCount number of blocks
|
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void process(float[] samples, int blockCount)
|
public void process(ChannelResultsBatch channelResults)
|
||||||
{
|
{
|
||||||
int length = blockCount * 2;
|
float[] samples = channelResults.getSamples();
|
||||||
|
int blockLength = channelResults.getBlockLength();
|
||||||
|
int channelOffset = mChannelOffset;
|
||||||
|
|
||||||
for(int index = 0; index < length; index += 2)
|
for(int index = channelOffset; index < samples.length; index += blockLength)
|
||||||
{
|
{
|
||||||
mMixerAssembler.receive(samples[index], samples[index + 1]);
|
mMixerAssembler.receive(samples[index], samples[index + 1]);
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* *****************************************************************************
|
* *****************************************************************************
|
||||||
* Copyright (C) 2014-2026 Dennis Sheirer
|
* Copyright (C) 2014-2024 Dennis Sheirer
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -18,9 +18,9 @@
|
|||||||
*/
|
*/
|
||||||
package io.github.dsheirer.dsp.filter.channelizer.output;
|
package io.github.dsheirer.dsp.filter.channelizer.output;
|
||||||
|
|
||||||
|
import io.github.dsheirer.dsp.filter.channelizer.ChannelResultsBatch;
|
||||||
import io.github.dsheirer.sample.complex.ComplexSamples;
|
import io.github.dsheirer.sample.complex.ComplexSamples;
|
||||||
import io.github.dsheirer.source.heartbeat.HeartbeatManager;
|
import io.github.dsheirer.source.heartbeat.HeartbeatManager;
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
@@ -29,6 +29,8 @@ public class TwoChannelOutputProcessor extends ChannelOutputProcessor
|
|||||||
{
|
{
|
||||||
private final static Logger mLog = LoggerFactory.getLogger(TwoChannelOutputProcessor.class);
|
private final static Logger mLog = LoggerFactory.getLogger(TwoChannelOutputProcessor.class);
|
||||||
private TwoChannelMixerAssembler mMixerAssembler;
|
private TwoChannelMixerAssembler mMixerAssembler;
|
||||||
|
private int mChannelOffset1;
|
||||||
|
private int mChannelOffset2;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Processor to extract two channels from a polyphase channelizer, synthesize/recombine the channels, apply
|
* Processor to extract two channels from a polyphase channelizer, synthesize/recombine the channels, apply
|
||||||
@@ -58,7 +60,7 @@ public class TwoChannelOutputProcessor extends ChannelOutputProcessor
|
|||||||
{
|
{
|
||||||
StringBuilder sb = new StringBuilder();
|
StringBuilder sb = new StringBuilder();
|
||||||
sb.append("Two Channel Output Processor");
|
sb.append("Two Channel Output Processor");
|
||||||
sb.append("\n\tIndices (doubled) ").append(Arrays.toString(getChannelOffsets()));
|
sb.append("\n\tIndices (doubled) 1 [").append(mChannelOffset1).append("] 2 [").append(mChannelOffset2).append("]");
|
||||||
sb.append("\n\tMixer Assembler: ").append(mMixerAssembler.getStateDescription());
|
sb.append("\n\tMixer Assembler: ").append(mMixerAssembler.getStateDescription());
|
||||||
return sb.toString();
|
return sb.toString();
|
||||||
}
|
}
|
||||||
@@ -96,32 +98,45 @@ public class TwoChannelOutputProcessor extends ChannelOutputProcessor
|
|||||||
|
|
||||||
//Set the channelized output results offsets to twice the channel index to account for each channel having
|
//Set the channelized output results offsets to twice the channel index to account for each channel having
|
||||||
//an I/Q pair
|
//an I/Q pair
|
||||||
setChannelOffsets(indexes.get(0) * 2, indexes.get(1) * 2);
|
int channelOffset1 = indexes.get(0) * 2;
|
||||||
|
int channelOffset2 = indexes.get(1) * 2;
|
||||||
|
|
||||||
|
enqueueUpdate(() -> {
|
||||||
|
mChannelOffset1 = channelOffset1;
|
||||||
|
mChannelOffset2 = channelOffset2;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Synthesizes the two copied channels, applies frequency translation, and delivers the frequency-corrected channel
|
* Extract the channel from the channel results array, apply frequency translation, and deliver the
|
||||||
* I/Q sample set to the complex sample listener.
|
* extracted frequency-corrected channel I/Q sample set to the complex sample listener.
|
||||||
*
|
*
|
||||||
* @param samples containing an I/Q pair for each of the two channels per block (I1,Q1,I2,Q2 ...)
|
* @param channelResults to process containing blocks of channel I/Q sample pairs (I0,Q0,I1,Q1...In,Qn)
|
||||||
* @param blockCount number of blocks
|
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void process(float[] samples, int blockCount)
|
public void process(ChannelResultsBatch channelResults)
|
||||||
{
|
{
|
||||||
|
float[] samples = channelResults.getSamples();
|
||||||
|
int blockLength = channelResults.getBlockLength();
|
||||||
|
int blockCount = channelResults.getBlockCount();
|
||||||
|
int channelOffset1 = mChannelOffset1;
|
||||||
|
int channelOffset2 = mChannelOffset2;
|
||||||
|
|
||||||
//Translate channel 2 up by FS/2 (multiply by (-1)^n) so that it sits adjacent to channel 1 for synthesis. The
|
//Translate channel 2 up by FS/2 (multiply by (-1)^n) so that it sits adjacent to channel 1 for synthesis. The
|
||||||
//channelizer dispatches even-sized batches, so the index within the batch carries the absolute block parity.
|
//channelizer dispatches even-sized batches, so the index within the batch carries the absolute block parity.
|
||||||
for(int x = 0; x < blockCount; x++)
|
for(int x = 0; x < blockCount; x++)
|
||||||
{
|
{
|
||||||
int block = x * 4;
|
int block = x * blockLength;
|
||||||
|
|
||||||
if((x & 1) == 0)
|
if((x & 1) == 0)
|
||||||
{
|
{
|
||||||
mMixerAssembler.receive(samples[block], samples[block + 1], samples[block + 2], samples[block + 3]);
|
mMixerAssembler.receive(samples[block + channelOffset1], samples[block + channelOffset1 + 1],
|
||||||
|
samples[block + channelOffset2], samples[block + channelOffset2 + 1]);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
mMixerAssembler.receive(samples[block], samples[block + 1], -samples[block + 2], -samples[block + 3]);
|
mMixerAssembler.receive(samples[block + channelOffset1], samples[block + channelOffset1 + 1],
|
||||||
|
-samples[block + channelOffset2], -samples[block + channelOffset2 + 1]);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(mMixerAssembler.hasBuffer())
|
if(mMixerAssembler.hasBuffer())
|
||||||
|
|||||||
@@ -840,16 +840,11 @@ public class SDRTrunk implements Listener<TunerEvent>
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Updates the title bar with the tuner name. No-op when running headless (no main window).
|
* Updates the title bar with the tuner name
|
||||||
* @param tunerName optional
|
* @param tunerName optional
|
||||||
*/
|
*/
|
||||||
private void updateTitle(String tunerName)
|
private void updateTitle(String tunerName)
|
||||||
{
|
{
|
||||||
if(mMainGui == null)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(tunerName != null)
|
if(tunerName != null)
|
||||||
{
|
{
|
||||||
mMainGui.setTitle(mTitle + " - " + tunerName);
|
mMainGui.setTitle(mTitle + " - " + tunerName);
|
||||||
|
|||||||
@@ -1,35 +0,0 @@
|
|||||||
/*
|
|
||||||
* *****************************************************************************
|
|
||||||
* Copyright (C) 2014-2026 Dennis Sheirer
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
|
||||||
* ****************************************************************************
|
|
||||||
*/
|
|
||||||
|
|
||||||
package io.github.dsheirer.gui.map;
|
|
||||||
|
|
||||||
import javafx.scene.canvas.GraphicsContext;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Overlay drawn over the map tiles, in the order the layers were added to the {@link TileMapView}.
|
|
||||||
*/
|
|
||||||
public interface MapLayer
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Draws the layer. Called on the JavaFX thread.
|
|
||||||
* @param gc of the map canvas, in screen pixels
|
|
||||||
* @param map for converting positions to screen pixels
|
|
||||||
*/
|
|
||||||
void draw(GraphicsContext gc, TileMapView map);
|
|
||||||
}
|
|
||||||
@@ -1,59 +0,0 @@
|
|||||||
/*
|
|
||||||
* *****************************************************************************
|
|
||||||
* Copyright (C) 2014-2026 Dennis Sheirer
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
|
||||||
* ****************************************************************************
|
|
||||||
*/
|
|
||||||
|
|
||||||
package io.github.dsheirer.gui.map;
|
|
||||||
|
|
||||||
import io.github.dsheirer.gui.playlist.radioreference.RadioReferencePlaylistActions;
|
|
||||||
import io.github.dsheirer.gui.theme.ThemeManager;
|
|
||||||
import io.github.dsheirer.icon.IconModel;
|
|
||||||
import io.github.dsheirer.map.MapService;
|
|
||||||
import io.github.dsheirer.preference.UserPreferences;
|
|
||||||
import io.github.dsheirer.service.radioreference.RadioReferenceFrequencyIndex;
|
|
||||||
import javafx.application.Platform;
|
|
||||||
import javafx.embed.swing.JFXPanel;
|
|
||||||
import javafx.scene.Scene;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Swing panel that holds the JavaFX map view for the main application window. The JavaFX view is created on the
|
|
||||||
* JavaFX application thread after construction.
|
|
||||||
*/
|
|
||||||
public class MapPanel extends JFXPanel
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Constructs an instance
|
|
||||||
* @param mapService for the entities to plot
|
|
||||||
* @param iconModel for alias icons
|
|
||||||
* @param userPreferences for the map view and the user's location
|
|
||||||
* @param frequencyIndex of the radio reference frequencies near the user, for the trunked system sites, or null
|
|
||||||
* @param playlistActions to add sites to the playlist or enable their channels, or null
|
|
||||||
*/
|
|
||||||
public MapPanel(MapService mapService, IconModel iconModel, UserPreferences userPreferences,
|
|
||||||
RadioReferenceFrequencyIndex frequencyIndex, RadioReferencePlaylistActions playlistActions)
|
|
||||||
{
|
|
||||||
Platform.setImplicitExit(false);
|
|
||||||
ThemeManager.getInstance().registerSwing(this);
|
|
||||||
|
|
||||||
Platform.runLater(() -> {
|
|
||||||
MapView view = new MapView(mapService, iconModel, userPreferences, frequencyIndex, playlistActions, true);
|
|
||||||
Scene scene = new Scene(view);
|
|
||||||
ThemeManager.getInstance().register(scene);
|
|
||||||
setScene(scene);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -1,203 +0,0 @@
|
|||||||
/*
|
|
||||||
* *****************************************************************************
|
|
||||||
* Copyright (C) 2014-2026 Dennis Sheirer
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
|
||||||
* ****************************************************************************
|
|
||||||
*/
|
|
||||||
|
|
||||||
package io.github.dsheirer.gui.map;
|
|
||||||
|
|
||||||
import io.github.dsheirer.map.GeoPosition;
|
|
||||||
import io.github.dsheirer.preference.map.MapPreference;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Part of the world in view: the center point, the tile zoom level and the size of the view in pixels, with the
|
|
||||||
* conversions between positions and screen pixels. The map repeats east and west, so it can be panned around the
|
|
||||||
* world, and it stops at the top and bottom of the projection. Not thread safe: use it on the JavaFX thread.
|
|
||||||
*/
|
|
||||||
public class MapViewport
|
|
||||||
{
|
|
||||||
private double mCenterX = Mercator.x(0);
|
|
||||||
private double mCenterY = Mercator.y(0);
|
|
||||||
private int mZoom = 2;
|
|
||||||
private double mWidth;
|
|
||||||
private double mHeight;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Constructs an instance
|
|
||||||
*/
|
|
||||||
public MapViewport()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Tile zoom level
|
|
||||||
*/
|
|
||||||
public int getZoom()
|
|
||||||
{
|
|
||||||
return mZoom;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets the tile zoom level, keeping the center point
|
|
||||||
* @param zoom level, clamped to the map preference's range
|
|
||||||
*/
|
|
||||||
public void setZoom(int zoom)
|
|
||||||
{
|
|
||||||
mZoom = Math.clamp(zoom, MapPreference.MINIMUM_TILE_ZOOM, MapPreference.MAXIMUM_TILE_ZOOM);
|
|
||||||
clamp();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Changes the zoom level, keeping the position under the screen point in place
|
|
||||||
* @param zoom level, clamped to the map preference's range
|
|
||||||
* @param x of the screen point
|
|
||||||
* @param y of the screen point
|
|
||||||
*/
|
|
||||||
public void zoomAt(int zoom, double x, double y)
|
|
||||||
{
|
|
||||||
double worldX = (getLeft() + x) / getWorldSize();
|
|
||||||
double worldY = (getTop() + y) / getWorldSize();
|
|
||||||
mZoom = Math.clamp(zoom, MapPreference.MINIMUM_TILE_ZOOM, MapPreference.MAXIMUM_TILE_ZOOM);
|
|
||||||
mCenterX = worldX - (x - mWidth / 2.0) / getWorldSize();
|
|
||||||
mCenterY = worldY - (y - mHeight / 2.0) / getWorldSize();
|
|
||||||
clamp();
|
|
||||||
}
|
|
||||||
|
|
||||||
public double getWidth()
|
|
||||||
{
|
|
||||||
return mWidth;
|
|
||||||
}
|
|
||||||
|
|
||||||
public double getHeight()
|
|
||||||
{
|
|
||||||
return mHeight;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets the size of the view, keeping the center point
|
|
||||||
*/
|
|
||||||
public void setSize(double width, double height)
|
|
||||||
{
|
|
||||||
mWidth = Math.max(0, width);
|
|
||||||
mHeight = Math.max(0, height);
|
|
||||||
clamp();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Center point of the view
|
|
||||||
*/
|
|
||||||
public GeoPosition getCenter()
|
|
||||||
{
|
|
||||||
return new GeoPosition(Mercator.latitude(mCenterY), Mercator.longitude(mCenterX));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Centers the view on the position
|
|
||||||
*/
|
|
||||||
public void setCenter(GeoPosition position)
|
|
||||||
{
|
|
||||||
mCenterX = Mercator.x(position.getLongitude());
|
|
||||||
mCenterY = Mercator.y(position.getLatitude());
|
|
||||||
clamp();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Moves the view by screen pixels, as when the map is dragged by the opposite amount
|
|
||||||
* @param dx pixels to move the view east
|
|
||||||
* @param dy pixels to move the view south
|
|
||||||
*/
|
|
||||||
public void pan(double dx, double dy)
|
|
||||||
{
|
|
||||||
mCenterX += dx / getWorldSize();
|
|
||||||
mCenterY += dy / getWorldSize();
|
|
||||||
clamp();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* World width and height in pixels at the current zoom level
|
|
||||||
*/
|
|
||||||
public double getWorldSize()
|
|
||||||
{
|
|
||||||
return Mercator.worldSize(mZoom);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* World pixel at the left edge of the view, which is whole so tiles line up with screen pixels. It can be
|
|
||||||
* negative or past the world width, since the map repeats east and west.
|
|
||||||
*/
|
|
||||||
public double getLeft()
|
|
||||||
{
|
|
||||||
return Math.round(mCenterX * getWorldSize() - mWidth / 2.0);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* World pixel at the top edge of the view, which is whole so tiles line up with screen pixels
|
|
||||||
*/
|
|
||||||
public double getTop()
|
|
||||||
{
|
|
||||||
return Math.round(mCenterY * getWorldSize() - mHeight / 2.0);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Screen x of the longitude, for the copy of the world nearest the middle of the view
|
|
||||||
*/
|
|
||||||
public double getScreenX(double longitude)
|
|
||||||
{
|
|
||||||
double worldSize = getWorldSize();
|
|
||||||
double x = Mercator.x(longitude) * worldSize - getLeft();
|
|
||||||
double middle = mWidth / 2.0;
|
|
||||||
return x - Math.round((x - middle) / worldSize) * worldSize;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Screen y of the latitude
|
|
||||||
*/
|
|
||||||
public double getScreenY(double latitude)
|
|
||||||
{
|
|
||||||
return Mercator.y(latitude) * getWorldSize() - getTop();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Position at the screen point
|
|
||||||
*/
|
|
||||||
public GeoPosition getPosition(double x, double y)
|
|
||||||
{
|
|
||||||
double worldSize = getWorldSize();
|
|
||||||
return new GeoPosition(Mercator.latitude((getTop() + y) / worldSize),
|
|
||||||
Mercator.longitude((getLeft() + x) / worldSize));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Keeps the center within one copy of the world, and the top and bottom of the map at the edges of the view, or
|
|
||||||
* the map in the middle when it's shorter than the view
|
|
||||||
*/
|
|
||||||
private void clamp()
|
|
||||||
{
|
|
||||||
mCenterX = mCenterX - Math.floor(mCenterX);
|
|
||||||
|
|
||||||
double worldSize = getWorldSize();
|
|
||||||
double halfHeight = mHeight / 2.0 / worldSize;
|
|
||||||
|
|
||||||
if(halfHeight >= 0.5)
|
|
||||||
{
|
|
||||||
mCenterY = 0.5;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
mCenterY = Math.clamp(mCenterY, halfHeight, 1.0 - halfHeight);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,100 +0,0 @@
|
|||||||
/*
|
|
||||||
* *****************************************************************************
|
|
||||||
* Copyright (C) 2014-2026 Dennis Sheirer
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
|
||||||
* ****************************************************************************
|
|
||||||
*/
|
|
||||||
|
|
||||||
package io.github.dsheirer.gui.map;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Web (spherical) Mercator projection used by OpenStreetMap tiles. Positions are expressed as fractions of the world
|
|
||||||
* width and height (0 to 1), independent of the zoom level: x grows eastward from -180 degrees longitude and y grows
|
|
||||||
* southward from the top of the map at about 85.05 degrees north latitude.
|
|
||||||
*/
|
|
||||||
public final class Mercator
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Pixel width and height of a map tile
|
|
||||||
*/
|
|
||||||
public static final int TILE_SIZE = 256;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Northern and southern limit of the projection, where the map is square
|
|
||||||
*/
|
|
||||||
public static final double MAX_LATITUDE = 85.05112878;
|
|
||||||
|
|
||||||
private Mercator()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* World width and height in pixels at the zoom level
|
|
||||||
*/
|
|
||||||
public static double worldSize(int zoom)
|
|
||||||
{
|
|
||||||
return TILE_SIZE * (double)(1L << zoom);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Number of tiles across the world at the zoom level
|
|
||||||
*/
|
|
||||||
public static int tileCount(int zoom)
|
|
||||||
{
|
|
||||||
return 1 << zoom;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Longitude to a fraction of the world width
|
|
||||||
*/
|
|
||||||
public static double x(double longitude)
|
|
||||||
{
|
|
||||||
return (longitude + 180.0) / 360.0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Latitude to a fraction of the world height, clamped to the projection's limits
|
|
||||||
*/
|
|
||||||
public static double y(double latitude)
|
|
||||||
{
|
|
||||||
double radians = Math.toRadians(Math.clamp(latitude, -MAX_LATITUDE, MAX_LATITUDE));
|
|
||||||
return (1.0 - Math.log(Math.tan(radians) + 1.0 / Math.cos(radians)) / Math.PI) / 2.0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Fraction of the world width to a longitude, wrapped into -180 to 180 degrees
|
|
||||||
*/
|
|
||||||
public static double longitude(double x)
|
|
||||||
{
|
|
||||||
return normalizeLongitude(x * 360.0 - 180.0);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Fraction of the world height to a latitude
|
|
||||||
*/
|
|
||||||
public static double latitude(double y)
|
|
||||||
{
|
|
||||||
double n = Math.PI * (1.0 - 2.0 * Math.clamp(y, 0.0, 1.0));
|
|
||||||
return Math.toDegrees(Math.atan(Math.sinh(n)));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Wraps a longitude into -180 to 180 degrees, since the map can be panned past +/-180 degrees
|
|
||||||
*/
|
|
||||||
public static double normalizeLongitude(double longitude)
|
|
||||||
{
|
|
||||||
return ((longitude + 180.0) % 360.0 + 360.0) % 360.0 - 180.0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,220 +0,0 @@
|
|||||||
/*
|
|
||||||
* *****************************************************************************
|
|
||||||
* Copyright (C) 2014-2026 Dennis Sheirer
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
|
||||||
* ****************************************************************************
|
|
||||||
*/
|
|
||||||
|
|
||||||
package io.github.dsheirer.gui.map;
|
|
||||||
|
|
||||||
import io.github.dsheirer.preference.radioreference.RadioReferencePreference;
|
|
||||||
import io.github.dsheirer.rrapi.type.Coverage;
|
|
||||||
import io.github.dsheirer.service.radioreference.DistanceFormat;
|
|
||||||
import io.github.dsheirer.service.radioreference.SiteRecord;
|
|
||||||
import java.text.DecimalFormat;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
import javafx.scene.control.Label;
|
|
||||||
import javafx.scene.control.Separator;
|
|
||||||
import javafx.scene.layout.GridPane;
|
|
||||||
import javafx.scene.layout.HBox;
|
|
||||||
import javafx.scene.layout.Region;
|
|
||||||
import javafx.scene.layout.VBox;
|
|
||||||
import javafx.scene.text.Font;
|
|
||||||
import javafx.scene.text.FontWeight;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Card with the details of radio reference trunked system sites, shown when the mouse rests over a site's tower on the
|
|
||||||
* map: the system and protocol, the site, and the site's channels.
|
|
||||||
*/
|
|
||||||
public final class SiteCard
|
|
||||||
{
|
|
||||||
private static final int MAX_SITES = 3;
|
|
||||||
private static final int CHANNEL_COLUMNS = 3;
|
|
||||||
private static final int MAX_CHANNELS = 24;
|
|
||||||
private static final double MAX_TEXT_WIDTH = 380;
|
|
||||||
private static final String SEPARATOR = " · ";
|
|
||||||
private static final String STYLE = "-fx-background-color: -fx-control-inner-background; " +
|
|
||||||
"-fx-border-color: -fx-box-border; -fx-background-radius: 3; -fx-border-radius: 3; -fx-padding: 6; " +
|
|
||||||
"-fx-effect: dropshadow(gaussian, rgba(0,0,0,0.35), 6, 0, 1, 2);";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Channel frequency with a control channel marker: C for control, A for alternate control, or null
|
|
||||||
*/
|
|
||||||
public record Channel(String frequency, String marker) {}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Details of one site
|
|
||||||
* @param title system name
|
|
||||||
* @param lines protocol, site, identifiers
|
|
||||||
* @param channels of the site, up to the card's limit
|
|
||||||
* @param notes about the channels
|
|
||||||
*/
|
|
||||||
public record Entry(String title, List<String> lines, List<Channel> channels, List<String> notes) {}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Card content
|
|
||||||
* @param entries for the sites shown, nearest first
|
|
||||||
* @param moreSites count of the sites under the mouse that aren't shown
|
|
||||||
*/
|
|
||||||
public record Content(List<Entry> entries, int moreSites) {}
|
|
||||||
|
|
||||||
private SiteCard()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Content of the card for the sites
|
|
||||||
* @param sites under the mouse, nearest first
|
|
||||||
* @param location of the user, for the distances, or null
|
|
||||||
*/
|
|
||||||
public static Content content(List<SiteRecord> sites, RadioReferencePreference.Location location)
|
|
||||||
{
|
|
||||||
DecimalFormat frequencyFormat = new DecimalFormat("0.00000");
|
|
||||||
List<Entry> entries = new ArrayList<>();
|
|
||||||
int shown = Math.min(sites.size(), MAX_SITES);
|
|
||||||
|
|
||||||
for(int index = 0; index < shown; index++)
|
|
||||||
{
|
|
||||||
SiteRecord site = sites.get(index);
|
|
||||||
List<String> lines = new ArrayList<>();
|
|
||||||
addLine(lines, site.protocol(), site.voice());
|
|
||||||
String distance = location != null ? DistanceFormat.format(Coverage.distanceKilometers(
|
|
||||||
location.latitude(), location.longitude(), site.latitude(), site.longitude())) : null;
|
|
||||||
addLine(lines, "Site " + site.siteNumber(), site.description(), site.county(), distance);
|
|
||||||
addLine(lines, site.nac() != null ? "NAC " + site.nac() : null,
|
|
||||||
site.rfss() > 0 ? "RFSS " + site.rfss() : null, site.zone() > 0 ? "Zone " + site.zone() : null);
|
|
||||||
|
|
||||||
List<Channel> channels = new ArrayList<>();
|
|
||||||
List<String> notes = new ArrayList<>();
|
|
||||||
boolean control = false;
|
|
||||||
|
|
||||||
if(site.channels() != null)
|
|
||||||
{
|
|
||||||
for(SiteRecord.SiteChannel channel: site.channels().subList(0, Math.min(site.channels().size(),
|
|
||||||
MAX_CHANNELS)))
|
|
||||||
{
|
|
||||||
String marker = "Control".equals(channel.use()) ? "C" :
|
|
||||||
"Alternate control".equals(channel.use()) ? "A" : null;
|
|
||||||
control |= marker != null;
|
|
||||||
channels.add(new Channel(frequencyFormat.format(channel.frequencyHz() / 1E6), marker));
|
|
||||||
}
|
|
||||||
|
|
||||||
if(site.channels().size() > MAX_CHANNELS)
|
|
||||||
{
|
|
||||||
notes.add("+ " + (site.channels().size() - MAX_CHANNELS) + " more channels");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(control)
|
|
||||||
{
|
|
||||||
notes.add("C control, A alternate control");
|
|
||||||
}
|
|
||||||
|
|
||||||
entries.add(new Entry(site.systemName() != null ? site.systemName() : "(unnamed system)", lines,
|
|
||||||
channels, notes.isEmpty() ? List.of() : List.of(String.join(SEPARATOR, notes))));
|
|
||||||
}
|
|
||||||
|
|
||||||
return new Content(entries, sites.size() - shown);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Card node for the content
|
|
||||||
*/
|
|
||||||
public static Region create(Content content)
|
|
||||||
{
|
|
||||||
VBox card = new VBox(2);
|
|
||||||
card.setStyle(STYLE);
|
|
||||||
card.setMaxWidth(Region.USE_PREF_SIZE);
|
|
||||||
card.setMaxHeight(Region.USE_PREF_SIZE);
|
|
||||||
Font font = Font.font(11);
|
|
||||||
Font bold = Font.font(Font.getDefault().getFamily(), FontWeight.BOLD, 11);
|
|
||||||
|
|
||||||
for(int index = 0; index < content.entries().size(); index++)
|
|
||||||
{
|
|
||||||
Entry entry = content.entries().get(index);
|
|
||||||
|
|
||||||
if(index > 0)
|
|
||||||
{
|
|
||||||
card.getChildren().add(new Separator());
|
|
||||||
}
|
|
||||||
|
|
||||||
card.getChildren().add(label(entry.title(), bold));
|
|
||||||
entry.lines().forEach(line -> card.getChildren().add(label(line, font)));
|
|
||||||
|
|
||||||
if(!entry.channels().isEmpty())
|
|
||||||
{
|
|
||||||
GridPane grid = new GridPane();
|
|
||||||
grid.setHgap(10);
|
|
||||||
|
|
||||||
for(int channelIndex = 0; channelIndex < entry.channels().size(); channelIndex++)
|
|
||||||
{
|
|
||||||
Channel channel = entry.channels().get(channelIndex);
|
|
||||||
HBox cell = new HBox(3, label(channel.frequency(), font));
|
|
||||||
|
|
||||||
if(channel.marker() != null)
|
|
||||||
{
|
|
||||||
cell.getChildren().add(label(channel.marker(), bold));
|
|
||||||
}
|
|
||||||
|
|
||||||
grid.add(cell, channelIndex % CHANNEL_COLUMNS, channelIndex / CHANNEL_COLUMNS);
|
|
||||||
}
|
|
||||||
|
|
||||||
card.getChildren().add(grid);
|
|
||||||
}
|
|
||||||
|
|
||||||
entry.notes().forEach(note -> card.getChildren().add(label(note, font)));
|
|
||||||
}
|
|
||||||
|
|
||||||
if(content.moreSites() > 0)
|
|
||||||
{
|
|
||||||
card.getChildren().add(new Separator());
|
|
||||||
card.getChildren().add(label("+ " + content.moreSites() + " more site" +
|
|
||||||
(content.moreSites() > 1 ? "s" : "") + " here", font));
|
|
||||||
}
|
|
||||||
|
|
||||||
return card;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static Label label(String text, Font font)
|
|
||||||
{
|
|
||||||
Label label = new Label(text);
|
|
||||||
label.setFont(font);
|
|
||||||
label.setWrapText(true);
|
|
||||||
label.setMaxWidth(MAX_TEXT_WIDTH);
|
|
||||||
return label;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Adds a line with the non-empty values separated by dots, or nothing when all are empty
|
|
||||||
*/
|
|
||||||
private static void addLine(List<String> lines, String... values)
|
|
||||||
{
|
|
||||||
List<String> parts = new ArrayList<>();
|
|
||||||
|
|
||||||
for(String value: values)
|
|
||||||
{
|
|
||||||
if(value != null && !value.isBlank())
|
|
||||||
{
|
|
||||||
parts.add(value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(!parts.isEmpty())
|
|
||||||
{
|
|
||||||
lines.add(String.join(SEPARATOR, parts));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,156 +0,0 @@
|
|||||||
/*
|
|
||||||
* *****************************************************************************
|
|
||||||
* Copyright (C) 2014-2026 Dennis Sheirer
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
|
||||||
* ****************************************************************************
|
|
||||||
*/
|
|
||||||
|
|
||||||
package io.github.dsheirer.gui.map;
|
|
||||||
|
|
||||||
import io.github.dsheirer.service.radioreference.SiteRecord;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.Comparator;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.function.Supplier;
|
|
||||||
import javafx.scene.canvas.GraphicsContext;
|
|
||||||
import javafx.scene.paint.Color;
|
|
||||||
import javafx.scene.shape.ArcType;
|
|
||||||
import javafx.scene.shape.StrokeLineCap;
|
|
||||||
import javafx.scene.shape.StrokeLineJoin;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Radio reference trunked system sites: a radio tower at each site, with the base of the tower at the site location.
|
|
||||||
* Use on the JavaFX thread.
|
|
||||||
*/
|
|
||||||
public class SiteLayer implements MapLayer
|
|
||||||
{
|
|
||||||
private static final Color TOWER = Color.rgb(240, 128, 32);
|
|
||||||
private static final Color OUTLINE = Color.rgb(40, 40, 40, 200 / 255.0);
|
|
||||||
private static final double TOWER_WIDTH = 1.6;
|
|
||||||
private static final double OUTLINE_WIDTH = 3.6;
|
|
||||||
private static final double HEIGHT = 16;
|
|
||||||
private static final double HALF_BASE = 5;
|
|
||||||
//Hit area around the tower, in pixels from the site location
|
|
||||||
private static final double HIT_LEFT = -10;
|
|
||||||
private static final double HIT_TOP = -24;
|
|
||||||
private static final double HIT_WIDTH = 20;
|
|
||||||
private static final double HIT_HEIGHT = 28;
|
|
||||||
|
|
||||||
private final Supplier<List<SiteRecord>> mSites;
|
|
||||||
private boolean mShowSites = true;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Constructs an instance
|
|
||||||
* @param sites to draw, read each time the map is drawn
|
|
||||||
*/
|
|
||||||
public SiteLayer(Supplier<List<SiteRecord>> sites)
|
|
||||||
{
|
|
||||||
mSites = sites;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Shows or hides the sites
|
|
||||||
*/
|
|
||||||
public void setShowSites(boolean show)
|
|
||||||
{
|
|
||||||
mShowSites = show;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isShowSites()
|
|
||||||
{
|
|
||||||
return mShowSites;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sites whose tower is under the point, nearest first
|
|
||||||
* @param viewport of the map
|
|
||||||
* @param x of the point in the view
|
|
||||||
* @param y of the point in the view
|
|
||||||
* @return sites, or an empty list when the sites are hidden or none is under the point
|
|
||||||
*/
|
|
||||||
public List<SiteRecord> getSitesAt(MapViewport viewport, double x, double y)
|
|
||||||
{
|
|
||||||
if(!mShowSites)
|
|
||||||
{
|
|
||||||
return Collections.emptyList();
|
|
||||||
}
|
|
||||||
|
|
||||||
record Hit(SiteRecord site, double distance) {}
|
|
||||||
|
|
||||||
List<Hit> hits = new ArrayList<>();
|
|
||||||
|
|
||||||
for(SiteRecord site: mSites.get())
|
|
||||||
{
|
|
||||||
double dx = x - viewport.getScreenX(site.longitude());
|
|
||||||
double dy = y - viewport.getScreenY(site.latitude());
|
|
||||||
|
|
||||||
if(dx >= HIT_LEFT && dx < HIT_LEFT + HIT_WIDTH && dy >= HIT_TOP && dy < HIT_TOP + HIT_HEIGHT)
|
|
||||||
{
|
|
||||||
//Nearest to the middle of the tower first
|
|
||||||
hits.add(new Hit(site, Math.hypot(dx, dy + (HEIGHT / 2.0))));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//Stable, so sites at the same spot keep their order
|
|
||||||
hits.sort(Comparator.comparingDouble(Hit::distance));
|
|
||||||
return hits.stream().map(Hit::site).toList();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void draw(GraphicsContext gc, TileMapView map)
|
|
||||||
{
|
|
||||||
if(!mShowSites)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
MapViewport viewport = map.getViewport();
|
|
||||||
double width = viewport.getWidth();
|
|
||||||
double height = viewport.getHeight();
|
|
||||||
gc.setLineCap(StrokeLineCap.ROUND);
|
|
||||||
gc.setLineJoin(StrokeLineJoin.ROUND);
|
|
||||||
|
|
||||||
for(SiteRecord site: mSites.get())
|
|
||||||
{
|
|
||||||
double x = viewport.getScreenX(site.longitude());
|
|
||||||
double y = viewport.getScreenY(site.latitude());
|
|
||||||
|
|
||||||
if(x >= -20 && x <= width + 20 && y >= -4 && y <= height + 30)
|
|
||||||
{
|
|
||||||
drawTower(gc, x, y, OUTLINE, OUTLINE_WIDTH);
|
|
||||||
drawTower(gc, x, y, TOWER, TOWER_WIDTH);
|
|
||||||
gc.setFill(TOWER);
|
|
||||||
gc.fillOval(x - 2, y - HEIGHT - 2, 4, 4);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Strokes a tower with its base at the point: an A-frame mast with a cross brace and radio waves at the top
|
|
||||||
*/
|
|
||||||
private static void drawTower(GraphicsContext gc, double x, double y, Color color, double lineWidth)
|
|
||||||
{
|
|
||||||
double top = y - HEIGHT;
|
|
||||||
gc.setStroke(color);
|
|
||||||
gc.setLineWidth(lineWidth);
|
|
||||||
gc.strokePolyline(new double[]{x - HALF_BASE, x, x + HALF_BASE}, new double[]{y, top, y}, 3);
|
|
||||||
gc.strokeLine(x - (HALF_BASE * 0.55), y - (HEIGHT * 0.45), x + (HALF_BASE * 0.55), y - (HEIGHT * 0.45));
|
|
||||||
gc.strokeArc(x - 5, top - 4, 10, 8, 135, 90, ArcType.OPEN);
|
|
||||||
gc.strokeArc(x - 5, top - 4, 10, 8, -45, 90, ArcType.OPEN);
|
|
||||||
gc.strokeArc(x - 9, top - 7, 18, 14, 135, 90, ArcType.OPEN);
|
|
||||||
gc.strokeArc(x - 9, top - 7, 18, 14, -45, 90, ArcType.OPEN);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,122 +0,0 @@
|
|||||||
/*
|
|
||||||
* *****************************************************************************
|
|
||||||
* Copyright (C) 2014-2026 Dennis Sheirer
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
|
||||||
* ****************************************************************************
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
package io.github.dsheirer.gui.map;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Entry in the tile server chooser: a server with tiles that follow the theme, or always light or always dark tiles.
|
|
||||||
* Dark tiles come from the server's dark style, or are recolored light tiles when it has none.
|
|
||||||
* @param server tile server
|
|
||||||
* @param style of the tiles
|
|
||||||
*/
|
|
||||||
public record TileChoice(TileServer server, Style style)
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Tile style. The name is stored in the map preference. Don't change it.
|
|
||||||
*/
|
|
||||||
public enum Style
|
|
||||||
{
|
|
||||||
THEME(" - Auto"),
|
|
||||||
LIGHT(" - Light"),
|
|
||||||
DARK(" - Dark");
|
|
||||||
|
|
||||||
private final String mSuffix;
|
|
||||||
|
|
||||||
Style(String suffix)
|
|
||||||
{
|
|
||||||
mSuffix = suffix;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Choices offered to the user, in menu order: each server following the theme, then light, then dark
|
|
||||||
*/
|
|
||||||
public static final List<TileChoice> CHOICES;
|
|
||||||
|
|
||||||
static
|
|
||||||
{
|
|
||||||
List<TileChoice> choices = new ArrayList<>();
|
|
||||||
|
|
||||||
for(TileServer server: TileServer.SERVERS)
|
|
||||||
{
|
|
||||||
for(Style style: Style.values())
|
|
||||||
{
|
|
||||||
choices.add(new TileChoice(server, style));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
CHOICES = Collections.unmodifiableList(choices);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Choice with the server and style
|
|
||||||
* @param serverId from the map preference, or null
|
|
||||||
* @param style name from the map preference, or null
|
|
||||||
* @return choice, following the theme when the style is unknown, see {@link TileServer#get(String)}
|
|
||||||
*/
|
|
||||||
public static TileChoice get(String serverId, String style)
|
|
||||||
{
|
|
||||||
TileServer server = TileServer.get(serverId);
|
|
||||||
|
|
||||||
for(Style candidate: Style.values())
|
|
||||||
{
|
|
||||||
if(candidate.name().equals(style))
|
|
||||||
{
|
|
||||||
return new TileChoice(server, candidate);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return new TileChoice(server, Style.THEME);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Indicates if the tiles are dark
|
|
||||||
* @param darkTheme true when the application uses a dark theme
|
|
||||||
*/
|
|
||||||
public boolean isDark(boolean darkTheme)
|
|
||||||
{
|
|
||||||
return switch(style)
|
|
||||||
{
|
|
||||||
case THEME -> darkTheme;
|
|
||||||
case LIGHT -> false;
|
|
||||||
case DARK -> true;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Tiles to load
|
|
||||||
* @param darkTheme true when the application uses a dark theme
|
|
||||||
* @param key from the user, for a server that needs one, or null
|
|
||||||
*/
|
|
||||||
public TileSource getSource(boolean darkTheme, String key)
|
|
||||||
{
|
|
||||||
return server.getSource(isDark(darkTheme), key);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String toString()
|
|
||||||
{
|
|
||||||
return server.name() + style.mSuffix;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,89 +0,0 @@
|
|||||||
/*
|
|
||||||
* *****************************************************************************
|
|
||||||
* Copyright (C) 2014-2026 Dennis Sheirer
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
|
||||||
* ****************************************************************************
|
|
||||||
*/
|
|
||||||
|
|
||||||
package io.github.dsheirer.gui.map;
|
|
||||||
|
|
||||||
import javafx.scene.image.Image;
|
|
||||||
import javafx.scene.image.PixelFormat;
|
|
||||||
import javafx.scene.image.WritableImage;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Recolors light map tiles for a dark theme: inverts each pixel's lightness while keeping its hue, so a light
|
|
||||||
* background turns dark, water stays blue and roads keep their colors. The lightness is kept within a range so
|
|
||||||
* the darkest areas aren't black and the lightest aren't white, and the colors are muted a little.
|
|
||||||
*/
|
|
||||||
public final class TileDarkener
|
|
||||||
{
|
|
||||||
//Lightness of a white pixel after recoloring, and of a black pixel
|
|
||||||
static final double DARKEST = 0.10;
|
|
||||||
static final double LIGHTEST = 0.85;
|
|
||||||
private static final double SATURATION = 0.80;
|
|
||||||
|
|
||||||
private TileDarkener()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Recolored copy of the image. Can be called on any thread.
|
|
||||||
*/
|
|
||||||
public static Image darken(Image image)
|
|
||||||
{
|
|
||||||
int width = (int)image.getWidth();
|
|
||||||
int height = (int)image.getHeight();
|
|
||||||
int[] pixels = new int[width * height];
|
|
||||||
image.getPixelReader().getPixels(0, 0, width, height, PixelFormat.getIntArgbInstance(), pixels, 0, width);
|
|
||||||
|
|
||||||
for(int index = 0; index < pixels.length; index++)
|
|
||||||
{
|
|
||||||
pixels[index] = darken(pixels[index]);
|
|
||||||
}
|
|
||||||
|
|
||||||
WritableImage darkened = new WritableImage(width, height);
|
|
||||||
darkened.getPixelWriter().setPixels(0, 0, width, height, PixelFormat.getIntArgbInstance(), pixels, 0, width);
|
|
||||||
return darkened;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Recolors one ARGB pixel: the HSL lightness L becomes DARKEST + (LIGHTEST - DARKEST) * (1 - L), and the
|
|
||||||
* saturation is scaled by SATURATION, keeping the hue and alpha
|
|
||||||
*/
|
|
||||||
static int darken(int argb)
|
|
||||||
{
|
|
||||||
double r = ((argb >> 16) & 0xFF) / 255.0;
|
|
||||||
double g = ((argb >> 8) & 0xFF) / 255.0;
|
|
||||||
double b = (argb & 0xFF) / 255.0;
|
|
||||||
double max = Math.max(r, Math.max(g, b));
|
|
||||||
double min = Math.min(r, Math.min(g, b));
|
|
||||||
double lightness = (max + min) / 2.0;
|
|
||||||
double chroma = max - min;
|
|
||||||
double target = DARKEST + (LIGHTEST - DARKEST) * (1.0 - lightness);
|
|
||||||
|
|
||||||
//Chroma that keeps the saturation at the new lightness: saturation = chroma / (1 - |2L - 1|)
|
|
||||||
double room = 1.0 - Math.abs(2.0 * lightness - 1.0);
|
|
||||||
double scale = chroma > 0 && room > 0 ? SATURATION * (1.0 - Math.abs(2.0 * target - 1.0)) / room : 0;
|
|
||||||
|
|
||||||
return (argb & 0xFF000000) | (channel(target + (r - lightness) * scale) << 16) |
|
|
||||||
(channel(target + (g - lightness) * scale) << 8) | channel(target + (b - lightness) * scale);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static int channel(double value)
|
|
||||||
{
|
|
||||||
return (int)Math.round(Math.clamp(value, 0.0, 1.0) * 255.0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
/*
|
|
||||||
* *****************************************************************************
|
|
||||||
* Copyright (C) 2014-2026 Dennis Sheirer
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
|
||||||
* ****************************************************************************
|
|
||||||
*/
|
|
||||||
|
|
||||||
package io.github.dsheirer.gui.map;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Map tile address in the OpenStreetMap (slippy map) scheme
|
|
||||||
* @param zoom level, 0 for the whole world in one tile
|
|
||||||
* @param x tile column, 0 to 2^zoom - 1, west to east
|
|
||||||
* @param y tile row, 0 to 2^zoom - 1, north to south
|
|
||||||
*/
|
|
||||||
public record TileKey(int zoom, int x, int y)
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Tile that covers this tile at a lower (farther) zoom level
|
|
||||||
* @param levels to go up, 1 or more
|
|
||||||
* @return covering tile
|
|
||||||
*/
|
|
||||||
public TileKey parent(int levels)
|
|
||||||
{
|
|
||||||
return new TileKey(zoom - levels, x >> levels, y >> levels);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,492 +0,0 @@
|
|||||||
/*
|
|
||||||
* *****************************************************************************
|
|
||||||
* Copyright (C) 2014-2026 Dennis Sheirer
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
|
||||||
* ****************************************************************************
|
|
||||||
*/
|
|
||||||
|
|
||||||
package io.github.dsheirer.gui.map;
|
|
||||||
|
|
||||||
import java.io.ByteArrayInputStream;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.net.URI;
|
|
||||||
import java.net.http.HttpClient;
|
|
||||||
import java.net.http.HttpRequest;
|
|
||||||
import java.net.http.HttpResponse;
|
|
||||||
import java.nio.file.Files;
|
|
||||||
import java.nio.file.Path;
|
|
||||||
import java.nio.file.StandardCopyOption;
|
|
||||||
import java.nio.file.attribute.FileTime;
|
|
||||||
import java.time.Duration;
|
|
||||||
import java.time.ZonedDateTime;
|
|
||||||
import java.time.format.DateTimeFormatter;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.Comparator;
|
|
||||||
import java.util.LinkedHashMap;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Objects;
|
|
||||||
import java.util.Optional;
|
|
||||||
import java.util.Set;
|
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
|
||||||
import java.util.concurrent.LinkedBlockingDeque;
|
|
||||||
import java.util.concurrent.atomic.AtomicBoolean;
|
|
||||||
import java.util.function.Consumer;
|
|
||||||
import java.util.regex.Matcher;
|
|
||||||
import java.util.regex.Pattern;
|
|
||||||
import java.util.stream.Stream;
|
|
||||||
import javafx.scene.image.Image;
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Loads map tile images from a {@link TileSource} in the background, with a memory cache of recently drawn tiles and
|
|
||||||
* a disk cache that follows the tile server's caching headers. Follows the OpenStreetMap tile usage policy, which
|
|
||||||
* suits the other servers too: an identifying User-Agent, two download threads, and local caching. The newest
|
|
||||||
* requests load first and requests for tiles that scrolled out of view are dropped. Changing the source drops the
|
|
||||||
* loaded and requested tiles.
|
|
||||||
*/
|
|
||||||
public class TileLoader
|
|
||||||
{
|
|
||||||
private static final Logger mLog = LoggerFactory.getLogger(TileLoader.class);
|
|
||||||
private static final String USER_AGENT = "sdrtrunk (https://github.com/DSheirer/sdrtrunk)";
|
|
||||||
private static final int DOWNLOAD_THREADS = 2;
|
|
||||||
//256 tiles of 256x256 pixels is about 64 MB
|
|
||||||
private static final int MEMORY_CACHE_TILES = 256;
|
|
||||||
private static final Duration DEFAULT_EXPIRY = Duration.ofDays(7);
|
|
||||||
private static final Duration MINIMUM_EXPIRY = Duration.ofHours(1);
|
|
||||||
private static final Duration RETRY_DELAY = Duration.ofSeconds(60);
|
|
||||||
private static final long DISK_CACHE_LIMIT_BYTES = 512L * 1024 * 1024;
|
|
||||||
private static final long DISK_CACHE_TRIM_BYTES = 400L * 1024 * 1024;
|
|
||||||
private static final Pattern MAX_AGE = Pattern.compile("max-age=(\\d+)");
|
|
||||||
|
|
||||||
private final Path mCacheDirectory;
|
|
||||||
private final Consumer<TileKey> mLoadedListener;
|
|
||||||
private final HttpClient mHttpClient;
|
|
||||||
private final Map<TileKey,Image> mMemoryCache = new LinkedHashMap<>(MEMORY_CACHE_TILES, 0.75f, true)
|
|
||||||
{
|
|
||||||
@Override
|
|
||||||
protected boolean removeEldestEntry(Map.Entry<TileKey,Image> eldest)
|
|
||||||
{
|
|
||||||
return size() > MEMORY_CACHE_TILES;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
private final LinkedBlockingDeque<TileKey> mQueue = new LinkedBlockingDeque<>();
|
|
||||||
private final Set<TileKey> mPending = ConcurrentHashMap.newKeySet();
|
|
||||||
private final Map<TileKey,Long> mFailures = new ConcurrentHashMap<>();
|
|
||||||
private volatile Set<TileKey> mWanted = Collections.emptySet();
|
|
||||||
private volatile TileSource mSource;
|
|
||||||
private final AtomicBoolean mTrimmed = new AtomicBoolean();
|
|
||||||
private final List<Thread> mThreads = new ArrayList<>();
|
|
||||||
private volatile boolean mRunning = true;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Constructs an instance and starts the download threads. Nothing loads until a source is set.
|
|
||||||
* @param cacheDirectory for the disk cache, with a folder for each source, or null for no disk cache
|
|
||||||
* @param loadedListener notified on a download thread when a requested tile is ready in {@link #get(TileKey)}
|
|
||||||
*/
|
|
||||||
public TileLoader(Path cacheDirectory, Consumer<TileKey> loadedListener)
|
|
||||||
{
|
|
||||||
mCacheDirectory = cacheDirectory;
|
|
||||||
mLoadedListener = loadedListener;
|
|
||||||
mHttpClient = HttpClient.newBuilder().connectTimeout(Duration.ofSeconds(10))
|
|
||||||
.followRedirects(HttpClient.Redirect.NORMAL).build();
|
|
||||||
|
|
||||||
for(int index = 0; index < DOWNLOAD_THREADS; index++)
|
|
||||||
{
|
|
||||||
Thread thread = Thread.ofPlatform().daemon().name("sdrtrunk map tile loader " + index)
|
|
||||||
.unstarted(this::run);
|
|
||||||
mThreads.add(thread);
|
|
||||||
thread.start();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets the tiles to load, dropping the loaded and requested tiles of the previous source. Call on the thread that
|
|
||||||
* requests tiles.
|
|
||||||
* @param source of the tiles, or null to load none
|
|
||||||
*/
|
|
||||||
public void setSource(TileSource source)
|
|
||||||
{
|
|
||||||
if(Objects.equals(source, mSource))
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
mSource = source;
|
|
||||||
mQueue.clear();
|
|
||||||
mPending.clear();
|
|
||||||
mFailures.clear();
|
|
||||||
|
|
||||||
synchronized(mMemoryCache)
|
|
||||||
{
|
|
||||||
mMemoryCache.clear();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Tile image from the memory cache
|
|
||||||
* @param key of the tile
|
|
||||||
* @return image, or null when it isn't loaded
|
|
||||||
*/
|
|
||||||
public Image get(TileKey key)
|
|
||||||
{
|
|
||||||
synchronized(mMemoryCache)
|
|
||||||
{
|
|
||||||
return mMemoryCache.get(key);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets the tiles that are in view. Queued requests for other tiles are dropped when they come up.
|
|
||||||
*/
|
|
||||||
public void setWanted(Set<TileKey> wanted)
|
|
||||||
{
|
|
||||||
mWanted = Set.copyOf(wanted);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Requests a tile, unless it's loaded, already requested, or failed recently. The newest request loads first.
|
|
||||||
*/
|
|
||||||
public void request(TileKey key)
|
|
||||||
{
|
|
||||||
TileSource source = mSource;
|
|
||||||
|
|
||||||
if(source == null || !source.isAvailable() || get(key) != null)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
Long failed = mFailures.get(key);
|
|
||||||
|
|
||||||
if(failed != null && System.currentTimeMillis() < failed + RETRY_DELAY.toMillis())
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(mPending.add(key))
|
|
||||||
{
|
|
||||||
mQueue.addLast(key);
|
|
||||||
}
|
|
||||||
else if(mQueue.remove(key))
|
|
||||||
{
|
|
||||||
//Requested again, so move it to the front of the line
|
|
||||||
mQueue.addLast(key);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Stops the download threads
|
|
||||||
*/
|
|
||||||
public void dispose()
|
|
||||||
{
|
|
||||||
mRunning = false;
|
|
||||||
mThreads.forEach(Thread::interrupt);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Download thread: takes the newest request, from the disk cache when it's fresh, else from the tile server
|
|
||||||
*/
|
|
||||||
private void run()
|
|
||||||
{
|
|
||||||
trimDiskCache();
|
|
||||||
|
|
||||||
while(mRunning)
|
|
||||||
{
|
|
||||||
TileKey key;
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
key = mQueue.takeLast();
|
|
||||||
}
|
|
||||||
catch(InterruptedException e)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
TileSource source = mSource;
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
if(source != null && source.isAvailable() && mWanted.contains(key))
|
|
||||||
{
|
|
||||||
Image image = load(key, source);
|
|
||||||
|
|
||||||
//Drop the tile when the source changed while it loaded
|
|
||||||
if(source == mSource)
|
|
||||||
{
|
|
||||||
if(image != null)
|
|
||||||
{
|
|
||||||
mFailures.remove(key);
|
|
||||||
|
|
||||||
synchronized(mMemoryCache)
|
|
||||||
{
|
|
||||||
mMemoryCache.put(key, image);
|
|
||||||
}
|
|
||||||
|
|
||||||
mLoadedListener.accept(key);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
mFailures.put(key, System.currentTimeMillis());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch(Exception e)
|
|
||||||
{
|
|
||||||
mLog.error("Error loading map tile " + (source != null ? source.cacheName() : "") + " " + key, e);
|
|
||||||
mFailures.put(key, System.currentTimeMillis());
|
|
||||||
}
|
|
||||||
finally
|
|
||||||
{
|
|
||||||
mPending.remove(key);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Loads a tile from the disk cache while it's fresh, else downloads it, falling back to a stale cached copy when the
|
|
||||||
* download fails. Recolors the tile when the source darkens its tiles.
|
|
||||||
* @return image, or null
|
|
||||||
*/
|
|
||||||
private Image load(TileKey key, TileSource source)
|
|
||||||
{
|
|
||||||
Path file = getCacheFile(key, source);
|
|
||||||
byte[] bytes = null;
|
|
||||||
boolean fresh = false;
|
|
||||||
|
|
||||||
if(file != null && Files.isRegularFile(file))
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
//The file's modified time is when it expires
|
|
||||||
fresh = Files.getLastModifiedTime(file).toMillis() > System.currentTimeMillis();
|
|
||||||
bytes = Files.readAllBytes(file);
|
|
||||||
}
|
|
||||||
catch(IOException e)
|
|
||||||
{
|
|
||||||
bytes = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(!fresh)
|
|
||||||
{
|
|
||||||
byte[] downloaded = download(key, file, source);
|
|
||||||
|
|
||||||
if(downloaded != null)
|
|
||||||
{
|
|
||||||
bytes = downloaded;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(bytes == null)
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
Image image = new Image(new ByteArrayInputStream(bytes));
|
|
||||||
|
|
||||||
if(image.isError())
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
return source.darken() ? TileDarkener.darken(image) : image;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Downloads the tile and stores it in the disk cache
|
|
||||||
* @param key of the tile
|
|
||||||
* @param file of the disk cache, or null
|
|
||||||
* @param source of the tile
|
|
||||||
* @return tile image bytes, or null when the download failed
|
|
||||||
*/
|
|
||||||
private byte[] download(TileKey key, Path file, TileSource source)
|
|
||||||
{
|
|
||||||
if(!mRunning)
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
URI uri = URI.create(source.getUrl(key));
|
|
||||||
//The URL can hold the user's key, so the log names the source and the tile instead
|
|
||||||
String tile = source.cacheName() + " " + key;
|
|
||||||
HttpRequest request = HttpRequest.newBuilder(uri).timeout(Duration.ofSeconds(20))
|
|
||||||
.header("User-Agent", USER_AGENT).GET().build();
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
HttpResponse<byte[]> response = mHttpClient.send(request, HttpResponse.BodyHandlers.ofByteArray());
|
|
||||||
|
|
||||||
if(response.statusCode() != 200)
|
|
||||||
{
|
|
||||||
mLog.debug("Map tile " + tile + " response " + response.statusCode());
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
byte[] bytes = response.body();
|
|
||||||
|
|
||||||
if(file != null)
|
|
||||||
{
|
|
||||||
store(file, bytes, getExpiry(response));
|
|
||||||
}
|
|
||||||
|
|
||||||
return bytes;
|
|
||||||
}
|
|
||||||
catch(InterruptedException e)
|
|
||||||
{
|
|
||||||
Thread.currentThread().interrupt();
|
|
||||||
}
|
|
||||||
catch(IOException e)
|
|
||||||
{
|
|
||||||
mLog.debug("Unable to download map tile " + tile + " - " + e.getMessage());
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Time the tile expires: the Cache-Control max-age, else the Expires header, else a week, and at least an hour
|
|
||||||
*/
|
|
||||||
private static long getExpiry(HttpResponse<?> response)
|
|
||||||
{
|
|
||||||
long now = System.currentTimeMillis();
|
|
||||||
Duration expiry = DEFAULT_EXPIRY;
|
|
||||||
Optional<String> cacheControl = response.headers().firstValue("Cache-Control");
|
|
||||||
Optional<String> expires = response.headers().firstValue("Expires");
|
|
||||||
|
|
||||||
if(cacheControl.isPresent())
|
|
||||||
{
|
|
||||||
Matcher matcher = MAX_AGE.matcher(cacheControl.get());
|
|
||||||
|
|
||||||
if(matcher.find())
|
|
||||||
{
|
|
||||||
expiry = Duration.ofSeconds(Long.parseLong(matcher.group(1)));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if(expires.isPresent())
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
long time = ZonedDateTime.parse(expires.get(), DateTimeFormatter.RFC_1123_DATE_TIME).toInstant()
|
|
||||||
.toEpochMilli();
|
|
||||||
expiry = Duration.ofMillis(time - now);
|
|
||||||
}
|
|
||||||
catch(Exception e)
|
|
||||||
{
|
|
||||||
//Use the default
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(expiry.compareTo(MINIMUM_EXPIRY) < 0)
|
|
||||||
{
|
|
||||||
expiry = MINIMUM_EXPIRY;
|
|
||||||
}
|
|
||||||
|
|
||||||
return now + expiry.toMillis();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Writes the tile to the disk cache, with its modified time set to when it expires
|
|
||||||
*/
|
|
||||||
private static void store(Path file, byte[] bytes, long expiry)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
Files.createDirectories(file.getParent());
|
|
||||||
Path temporary = Files.createTempFile(file.getParent(), "tile", ".tmp");
|
|
||||||
Files.write(temporary, bytes);
|
|
||||||
Files.setLastModifiedTime(temporary, FileTime.fromMillis(expiry));
|
|
||||||
Files.move(temporary, file, StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.ATOMIC_MOVE);
|
|
||||||
}
|
|
||||||
catch(IOException e)
|
|
||||||
{
|
|
||||||
mLog.debug("Unable to cache map tile " + file + " - " + e.getMessage());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private Path getCacheFile(TileKey key, TileSource source)
|
|
||||||
{
|
|
||||||
return mCacheDirectory != null ? mCacheDirectory.resolve(source.cacheName())
|
|
||||||
.resolve(String.valueOf(key.zoom())).resolve(String.valueOf(key.x())).resolve(key.y() + ".tile") : null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Deletes the tiles that expire first when the disk cache grows past its limit. Runs once per instance.
|
|
||||||
*/
|
|
||||||
private void trimDiskCache()
|
|
||||||
{
|
|
||||||
if(mCacheDirectory == null || !Files.isDirectory(mCacheDirectory) || mTrimmed.getAndSet(true))
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
record CachedTile(Path path, long size, long expiry) {}
|
|
||||||
|
|
||||||
List<CachedTile> tiles = new ArrayList<>();
|
|
||||||
|
|
||||||
try(Stream<Path> stream = Files.walk(mCacheDirectory))
|
|
||||||
{
|
|
||||||
stream.filter(Files::isRegularFile).forEach(path -> {
|
|
||||||
try
|
|
||||||
{
|
|
||||||
tiles.add(new CachedTile(path, Files.size(path), Files.getLastModifiedTime(path).toMillis()));
|
|
||||||
}
|
|
||||||
catch(IOException e)
|
|
||||||
{
|
|
||||||
//Skip it
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
catch(IOException e)
|
|
||||||
{
|
|
||||||
mLog.debug("Unable to read the map tile cache - " + e.getMessage());
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
long total = tiles.stream().mapToLong(CachedTile::size).sum();
|
|
||||||
|
|
||||||
if(total <= DISK_CACHE_LIMIT_BYTES)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
tiles.sort(Comparator.comparingLong(CachedTile::expiry));
|
|
||||||
int deleted = 0;
|
|
||||||
|
|
||||||
for(CachedTile tile: tiles)
|
|
||||||
{
|
|
||||||
if(total <= DISK_CACHE_TRIM_BYTES)
|
|
||||||
{
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
Files.deleteIfExists(tile.path());
|
|
||||||
total -= tile.size();
|
|
||||||
deleted++;
|
|
||||||
}
|
|
||||||
catch(IOException e)
|
|
||||||
{
|
|
||||||
//Skip it
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
mLog.info("Trimmed the map tile cache: deleted " + deleted + " tiles");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,546 +0,0 @@
|
|||||||
/*
|
|
||||||
* *****************************************************************************
|
|
||||||
* Copyright (C) 2014-2026 Dennis Sheirer
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
|
||||||
* ****************************************************************************
|
|
||||||
*/
|
|
||||||
|
|
||||||
package io.github.dsheirer.gui.map;
|
|
||||||
|
|
||||||
import io.github.dsheirer.map.GeoPosition;
|
|
||||||
import java.nio.file.Path;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Set;
|
|
||||||
import java.util.concurrent.CopyOnWriteArrayList;
|
|
||||||
import javafx.application.Platform;
|
|
||||||
import javafx.beans.property.ReadOnlyIntegerProperty;
|
|
||||||
import javafx.beans.property.ReadOnlyIntegerWrapper;
|
|
||||||
import javafx.geometry.VPos;
|
|
||||||
import javafx.scene.Cursor;
|
|
||||||
import javafx.scene.canvas.Canvas;
|
|
||||||
import javafx.scene.canvas.GraphicsContext;
|
|
||||||
import javafx.scene.image.Image;
|
|
||||||
import javafx.scene.input.KeyEvent;
|
|
||||||
import javafx.scene.input.MouseButton;
|
|
||||||
import javafx.scene.input.MouseEvent;
|
|
||||||
import javafx.scene.input.ScrollEvent;
|
|
||||||
import javafx.scene.input.ZoomEvent;
|
|
||||||
import javafx.scene.layout.Region;
|
|
||||||
import javafx.scene.paint.Color;
|
|
||||||
import javafx.scene.text.Font;
|
|
||||||
import javafx.scene.text.Text;
|
|
||||||
import javafx.scene.text.TextAlignment;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* JavaFX slippy map: tiles from a {@link TileSource} drawn on a canvas, with {@link MapLayer} overlays. While a tile
|
|
||||||
* loads, the matching part of a loaded tile from a farther zoom level stands in for it. Past the source's highest
|
|
||||||
* zoom level, its closest tiles are enlarged.
|
|
||||||
*
|
|
||||||
* Mouse: drag with the primary button to pan, scroll to zoom at the mouse, double-click or middle-click to center and
|
|
||||||
* zoom in. Keys: arrows pan, plus and minus zoom. Use on the JavaFX thread.
|
|
||||||
*/
|
|
||||||
public class TileMapView extends Region
|
|
||||||
{
|
|
||||||
private static final Color BACKGROUND = Color.rgb(221, 221, 221);
|
|
||||||
private static final Color DARK_BACKGROUND = Color.rgb(38, 38, 38);
|
|
||||||
private static final Color ATTRIBUTION_BACKGROUND = Color.rgb(255, 255, 255, 0.75);
|
|
||||||
private static final Color DARK_ATTRIBUTION_BACKGROUND = Color.rgb(30, 30, 30, 0.75);
|
|
||||||
private static final Color ATTRIBUTION_TEXT = Color.rgb(40, 40, 40);
|
|
||||||
private static final Color DARK_ATTRIBUTION_TEXT = Color.rgb(210, 210, 210);
|
|
||||||
private static final Font ATTRIBUTION_FONT = Font.font(11);
|
|
||||||
private static final Font MESSAGE_FONT = Font.font(14);
|
|
||||||
private static final int FALLBACK_LEVELS = 5;
|
|
||||||
//Scroll distance for one zoom step: one mouse wheel notch, or several trackpad events
|
|
||||||
private static final double SCROLL_STEP = 40.0;
|
|
||||||
private static final double PINCH_STEP = 1.4;
|
|
||||||
private static final double KEY_PAN_PIXELS = 64.0;
|
|
||||||
|
|
||||||
private final Canvas mCanvas = new Canvas();
|
|
||||||
private final MapViewport mViewport = new MapViewport();
|
|
||||||
private final TileLoader mTileLoader;
|
|
||||||
private final List<MapLayer> mLayers = new ArrayList<>();
|
|
||||||
private final List<Runnable> mViewListeners = new CopyOnWriteArrayList<>();
|
|
||||||
private final ReadOnlyIntegerWrapper mZoom = new ReadOnlyIntegerWrapper(mViewport.getZoom());
|
|
||||||
private final Text mMeasure = new Text();
|
|
||||||
private TileSource mSource;
|
|
||||||
private boolean mRedrawPending;
|
|
||||||
private double mDragX = Double.NaN;
|
|
||||||
private double mDragY = Double.NaN;
|
|
||||||
private double mScrollAccumulator;
|
|
||||||
private double mPinchAccumulator = 1.0;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Constructs an instance
|
|
||||||
* @param cacheDirectory for the map tiles on disk, or null to not keep tiles on disk
|
|
||||||
* @param loadTiles true to download tiles, or false for a blank map (tests and off-screen rendering)
|
|
||||||
*/
|
|
||||||
public TileMapView(Path cacheDirectory, boolean loadTiles)
|
|
||||||
{
|
|
||||||
mTileLoader = loadTiles ? new TileLoader(cacheDirectory, key -> Platform.runLater(this::requestRedraw)) : null;
|
|
||||||
getChildren().add(mCanvas);
|
|
||||||
setFocusTraversable(true);
|
|
||||||
setMinSize(0, 0);
|
|
||||||
setPrefSize(600, 400);
|
|
||||||
|
|
||||||
addEventHandler(MouseEvent.MOUSE_PRESSED, this::mousePressed);
|
|
||||||
addEventHandler(MouseEvent.MOUSE_DRAGGED, this::mouseDragged);
|
|
||||||
addEventHandler(MouseEvent.MOUSE_RELEASED, this::mouseReleased);
|
|
||||||
addEventHandler(MouseEvent.MOUSE_CLICKED, this::mouseClicked);
|
|
||||||
addEventHandler(ScrollEvent.SCROLL, this::scrolled);
|
|
||||||
addEventHandler(ZoomEvent.ZOOM_STARTED, event -> mPinchAccumulator = 1.0);
|
|
||||||
addEventHandler(ZoomEvent.ZOOM, this::pinched);
|
|
||||||
addEventHandler(KeyEvent.KEY_PRESSED, this::keyPressed);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Viewport, for converting positions to screen pixels
|
|
||||||
*/
|
|
||||||
public MapViewport getViewport()
|
|
||||||
{
|
|
||||||
return mViewport;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets the tiles to show, dropping the tiles of the previous source
|
|
||||||
* @param source of the tiles, or null to show none
|
|
||||||
*/
|
|
||||||
public void setSource(TileSource source)
|
|
||||||
{
|
|
||||||
mSource = source;
|
|
||||||
|
|
||||||
if(mTileLoader != null)
|
|
||||||
{
|
|
||||||
mTileLoader.setSource(source);
|
|
||||||
}
|
|
||||||
|
|
||||||
requestRedraw();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Source of the tiles, or null
|
|
||||||
*/
|
|
||||||
public TileSource getSource()
|
|
||||||
{
|
|
||||||
return mSource;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Tile zoom level, updated when the map zooms
|
|
||||||
*/
|
|
||||||
public ReadOnlyIntegerProperty zoomProperty()
|
|
||||||
{
|
|
||||||
return mZoom.getReadOnlyProperty();
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getZoom()
|
|
||||||
{
|
|
||||||
return mViewport.getZoom();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets the tile zoom level, keeping the center point
|
|
||||||
*/
|
|
||||||
public void setZoom(int zoom)
|
|
||||||
{
|
|
||||||
if(zoom != mViewport.getZoom())
|
|
||||||
{
|
|
||||||
mViewport.setZoom(zoom);
|
|
||||||
viewChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Changes the zoom level, keeping the position under the screen point in place
|
|
||||||
*/
|
|
||||||
public void zoomAt(int zoom, double x, double y)
|
|
||||||
{
|
|
||||||
if(zoom != mViewport.getZoom())
|
|
||||||
{
|
|
||||||
mViewport.zoomAt(zoom, x, y);
|
|
||||||
viewChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public GeoPosition getCenter()
|
|
||||||
{
|
|
||||||
return mViewport.getCenter();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Centers the map on the position
|
|
||||||
*/
|
|
||||||
public void setCenter(GeoPosition position)
|
|
||||||
{
|
|
||||||
if(position != null)
|
|
||||||
{
|
|
||||||
mViewport.setCenter(position);
|
|
||||||
viewChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Adds a layer over the tiles and the layers added before it
|
|
||||||
*/
|
|
||||||
public void addLayer(MapLayer layer)
|
|
||||||
{
|
|
||||||
mLayers.add(layer);
|
|
||||||
requestRedraw();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Adds a listener that's notified on the JavaFX thread each time the map pans or zooms
|
|
||||||
*/
|
|
||||||
public void addViewListener(Runnable listener)
|
|
||||||
{
|
|
||||||
mViewListeners.add(listener);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Redraws the map on the next JavaFX pulse. Can be called often: the requests are combined.
|
|
||||||
*/
|
|
||||||
public void requestRedraw()
|
|
||||||
{
|
|
||||||
if(!mRedrawPending)
|
|
||||||
{
|
|
||||||
mRedrawPending = true;
|
|
||||||
Platform.runLater(() -> {
|
|
||||||
mRedrawPending = false;
|
|
||||||
draw();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Stops loading tiles
|
|
||||||
*/
|
|
||||||
public void dispose()
|
|
||||||
{
|
|
||||||
if(mTileLoader != null)
|
|
||||||
{
|
|
||||||
mTileLoader.dispose();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void viewChanged()
|
|
||||||
{
|
|
||||||
mZoom.set(mViewport.getZoom());
|
|
||||||
requestRedraw();
|
|
||||||
mViewListeners.forEach(Runnable::run);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void layoutChildren()
|
|
||||||
{
|
|
||||||
double width = snapSizeX(getWidth());
|
|
||||||
double height = snapSizeY(getHeight());
|
|
||||||
|
|
||||||
if(mCanvas.getWidth() != width || mCanvas.getHeight() != height)
|
|
||||||
{
|
|
||||||
mCanvas.setWidth(width);
|
|
||||||
mCanvas.setHeight(height);
|
|
||||||
mViewport.setSize(width, height);
|
|
||||||
draw();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Draws the tiles and the layers now
|
|
||||||
*/
|
|
||||||
public void draw()
|
|
||||||
{
|
|
||||||
GraphicsContext gc = mCanvas.getGraphicsContext2D();
|
|
||||||
double width = mCanvas.getWidth();
|
|
||||||
double height = mCanvas.getHeight();
|
|
||||||
boolean dark = mSource != null && mSource.dark();
|
|
||||||
gc.setFill(dark ? DARK_BACKGROUND : BACKGROUND);
|
|
||||||
gc.fillRect(0, 0, width, height);
|
|
||||||
|
|
||||||
if(width <= 0 || height <= 0)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(mSource != null && mSource.isAvailable())
|
|
||||||
{
|
|
||||||
drawTiles(gc, width, height);
|
|
||||||
}
|
|
||||||
else if(mSource != null && mSource.unavailableReason() != null)
|
|
||||||
{
|
|
||||||
gc.setFill(dark ? DARK_ATTRIBUTION_TEXT : ATTRIBUTION_TEXT);
|
|
||||||
gc.setFont(MESSAGE_FONT);
|
|
||||||
gc.setTextAlign(TextAlignment.CENTER);
|
|
||||||
gc.setTextBaseline(VPos.CENTER);
|
|
||||||
gc.fillText(mSource.unavailableReason(), width / 2.0, height / 2.0);
|
|
||||||
}
|
|
||||||
|
|
||||||
for(MapLayer layer: mLayers)
|
|
||||||
{
|
|
||||||
gc.save();
|
|
||||||
layer.draw(gc, this);
|
|
||||||
gc.restore();
|
|
||||||
}
|
|
||||||
|
|
||||||
if(mSource != null)
|
|
||||||
{
|
|
||||||
drawAttribution(gc, mSource.attribution(), dark, width, height);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void drawTiles(GraphicsContext gc, double width, double height)
|
|
||||||
{
|
|
||||||
int zoom = mViewport.getZoom();
|
|
||||||
int count = Mercator.tileCount(zoom);
|
|
||||||
double left = mViewport.getLeft();
|
|
||||||
double top = mViewport.getTop();
|
|
||||||
int firstColumn = (int)Math.floor(left / Mercator.TILE_SIZE);
|
|
||||||
int lastColumn = (int)Math.floor((left + width - 1) / Mercator.TILE_SIZE);
|
|
||||||
int firstRow = Math.max(0, (int)Math.floor(top / Mercator.TILE_SIZE));
|
|
||||||
int lastRow = Math.min(count - 1, (int)Math.floor((top + height - 1) / Mercator.TILE_SIZE));
|
|
||||||
|
|
||||||
//Past the source's highest zoom level, its closest tiles are enlarged
|
|
||||||
int enlarged = Math.max(0, zoom - mSource.maxZoom());
|
|
||||||
Set<TileKey> wanted = new HashSet<>();
|
|
||||||
List<TileKey> missing = new ArrayList<>();
|
|
||||||
|
|
||||||
for(int row = firstRow; row <= lastRow; row++)
|
|
||||||
{
|
|
||||||
for(int column = firstColumn; column <= lastColumn; column++)
|
|
||||||
{
|
|
||||||
TileKey key = new TileKey(zoom, Math.floorMod(column, count), row);
|
|
||||||
TileKey source = enlarged > 0 ? key.parent(enlarged) : key;
|
|
||||||
double x = column * (double)Mercator.TILE_SIZE - left;
|
|
||||||
double y = row * (double)Mercator.TILE_SIZE - top;
|
|
||||||
wanted.add(source);
|
|
||||||
|
|
||||||
Image image = mTileLoader != null ? mTileLoader.get(source) : null;
|
|
||||||
|
|
||||||
if(image != null)
|
|
||||||
{
|
|
||||||
drawPart(gc, image, key, enlarged, x, y);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
drawFallback(gc, key, enlarged, x, y);
|
|
||||||
|
|
||||||
if(!missing.contains(source))
|
|
||||||
{
|
|
||||||
missing.add(source);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(mTileLoader != null)
|
|
||||||
{
|
|
||||||
mTileLoader.setWanted(wanted);
|
|
||||||
|
|
||||||
//Request the tiles nearest the middle last, so they load first
|
|
||||||
double scale = 1 << enlarged;
|
|
||||||
int sourceCount = Mercator.tileCount(zoom - enlarged);
|
|
||||||
double middleColumn = ((left + width / 2.0) / Mercator.TILE_SIZE) / scale - 0.5;
|
|
||||||
double middleRow = ((top + height / 2.0) / Mercator.TILE_SIZE) / scale - 0.5;
|
|
||||||
missing.sort((a, b) -> Double.compare(distance(b, middleColumn, middleRow, sourceCount),
|
|
||||||
distance(a, middleColumn, middleRow, sourceCount)));
|
|
||||||
missing.forEach(mTileLoader::request);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Distance in tiles from the middle of the view, allowing for the world repeating east and west
|
|
||||||
*/
|
|
||||||
private static double distance(TileKey key, double column, double row, int count)
|
|
||||||
{
|
|
||||||
double dx = Math.abs(key.x() - Math.floorMod((long)Math.floor(column), count));
|
|
||||||
dx = Math.min(dx, count - dx);
|
|
||||||
return Math.hypot(dx, key.y() - row);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Draws the part of a tile from a farther zoom level that covers the tile, enlarged to the tile's size
|
|
||||||
* @param image of the tile from the farther zoom level
|
|
||||||
* @param key of the tile to cover
|
|
||||||
* @param levels between the tiles' zoom levels, 0 to draw the whole image
|
|
||||||
*/
|
|
||||||
private static void drawPart(GraphicsContext gc, Image image, TileKey key, int levels, double x, double y)
|
|
||||||
{
|
|
||||||
if(levels == 0)
|
|
||||||
{
|
|
||||||
gc.drawImage(image, x, y, Mercator.TILE_SIZE, Mercator.TILE_SIZE);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
TileKey parent = key.parent(levels);
|
|
||||||
double size = image.getWidth() / (1 << levels);
|
|
||||||
double sourceX = (key.x() - ((long)parent.x() << levels)) * size;
|
|
||||||
double sourceY = (key.y() - ((long)parent.y() << levels)) * size;
|
|
||||||
gc.drawImage(image, sourceX, sourceY, size, size, x, y, Mercator.TILE_SIZE, Mercator.TILE_SIZE);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Draws the part of a loaded tile from a farther zoom level than the requested tile that covers the tile
|
|
||||||
* @param enlarged levels between the tile and the requested tile
|
|
||||||
*/
|
|
||||||
private void drawFallback(GraphicsContext gc, TileKey key, int enlarged, double x, double y)
|
|
||||||
{
|
|
||||||
if(mTileLoader == null)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
for(int levels = enlarged + 1; levels <= enlarged + FALLBACK_LEVELS && key.zoom() - levels >= 0; levels++)
|
|
||||||
{
|
|
||||||
Image image = mTileLoader.get(key.parent(levels));
|
|
||||||
|
|
||||||
if(image != null)
|
|
||||||
{
|
|
||||||
drawPart(gc, image, key, levels, x, y);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Attribution in the bottom right corner, required by the tile servers
|
|
||||||
*/
|
|
||||||
private void drawAttribution(GraphicsContext gc, String attribution, boolean dark, double width, double height)
|
|
||||||
{
|
|
||||||
mMeasure.setText(attribution);
|
|
||||||
mMeasure.setFont(ATTRIBUTION_FONT);
|
|
||||||
double boxWidth = mMeasure.getLayoutBounds().getWidth() + 8;
|
|
||||||
double boxHeight = 16;
|
|
||||||
gc.setFill(dark ? DARK_ATTRIBUTION_BACKGROUND : ATTRIBUTION_BACKGROUND);
|
|
||||||
gc.fillRect(width - boxWidth, height - boxHeight, boxWidth, boxHeight);
|
|
||||||
gc.setFill(dark ? DARK_ATTRIBUTION_TEXT : ATTRIBUTION_TEXT);
|
|
||||||
gc.setFont(ATTRIBUTION_FONT);
|
|
||||||
gc.setTextAlign(TextAlignment.LEFT);
|
|
||||||
gc.setTextBaseline(VPos.CENTER);
|
|
||||||
gc.fillText(attribution, width - boxWidth + 4, height - boxHeight / 2.0);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void mousePressed(MouseEvent event)
|
|
||||||
{
|
|
||||||
requestFocus();
|
|
||||||
|
|
||||||
if(event.getButton() == MouseButton.PRIMARY)
|
|
||||||
{
|
|
||||||
mDragX = event.getX();
|
|
||||||
mDragY = event.getY();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void mouseDragged(MouseEvent event)
|
|
||||||
{
|
|
||||||
if(event.isPrimaryButtonDown() && !Double.isNaN(mDragX))
|
|
||||||
{
|
|
||||||
mViewport.pan(mDragX - event.getX(), mDragY - event.getY());
|
|
||||||
mDragX = event.getX();
|
|
||||||
mDragY = event.getY();
|
|
||||||
setCursor(Cursor.MOVE);
|
|
||||||
viewChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void mouseReleased(MouseEvent event)
|
|
||||||
{
|
|
||||||
if(event.getButton() == MouseButton.PRIMARY)
|
|
||||||
{
|
|
||||||
mDragX = Double.NaN;
|
|
||||||
mDragY = Double.NaN;
|
|
||||||
setCursor(Cursor.DEFAULT);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void mouseClicked(MouseEvent event)
|
|
||||||
{
|
|
||||||
boolean doubleClick = event.getButton() == MouseButton.PRIMARY && event.getClickCount() == 2 &&
|
|
||||||
event.isStillSincePress();
|
|
||||||
|
|
||||||
if(doubleClick || event.getButton() == MouseButton.MIDDLE)
|
|
||||||
{
|
|
||||||
mViewport.setCenter(mViewport.getPosition(event.getX(), event.getY()));
|
|
||||||
mViewport.setZoom(mViewport.getZoom() + 1);
|
|
||||||
viewChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void scrolled(ScrollEvent event)
|
|
||||||
{
|
|
||||||
if(event.getDeltaY() == 0)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
//Restart when the direction changes
|
|
||||||
if(Math.signum(event.getDeltaY()) != Math.signum(mScrollAccumulator))
|
|
||||||
{
|
|
||||||
mScrollAccumulator = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
mScrollAccumulator += event.getDeltaY();
|
|
||||||
int steps = (int)(mScrollAccumulator / SCROLL_STEP);
|
|
||||||
|
|
||||||
if(steps != 0)
|
|
||||||
{
|
|
||||||
mScrollAccumulator -= steps * SCROLL_STEP;
|
|
||||||
zoomAt(mViewport.getZoom() + steps, event.getX(), event.getY());
|
|
||||||
}
|
|
||||||
|
|
||||||
event.consume();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void pinched(ZoomEvent event)
|
|
||||||
{
|
|
||||||
mPinchAccumulator *= event.getZoomFactor();
|
|
||||||
|
|
||||||
if(mPinchAccumulator >= PINCH_STEP)
|
|
||||||
{
|
|
||||||
mPinchAccumulator = 1.0;
|
|
||||||
zoomAt(mViewport.getZoom() + 1, event.getX(), event.getY());
|
|
||||||
}
|
|
||||||
else if(mPinchAccumulator <= 1.0 / PINCH_STEP)
|
|
||||||
{
|
|
||||||
mPinchAccumulator = 1.0;
|
|
||||||
zoomAt(mViewport.getZoom() - 1, event.getX(), event.getY());
|
|
||||||
}
|
|
||||||
|
|
||||||
event.consume();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void keyPressed(KeyEvent event)
|
|
||||||
{
|
|
||||||
switch(event.getCode())
|
|
||||||
{
|
|
||||||
case LEFT, KP_LEFT -> pan(-KEY_PAN_PIXELS, 0);
|
|
||||||
case RIGHT, KP_RIGHT -> pan(KEY_PAN_PIXELS, 0);
|
|
||||||
case UP, KP_UP -> pan(0, -KEY_PAN_PIXELS);
|
|
||||||
case DOWN, KP_DOWN -> pan(0, KEY_PAN_PIXELS);
|
|
||||||
case PLUS, EQUALS, ADD -> setZoom(getZoom() + 1);
|
|
||||||
case MINUS, SUBTRACT -> setZoom(getZoom() - 1);
|
|
||||||
default -> {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
event.consume();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void pan(double dx, double dy)
|
|
||||||
{
|
|
||||||
mViewport.pan(dx, dy);
|
|
||||||
viewChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,129 +0,0 @@
|
|||||||
/*
|
|
||||||
* *****************************************************************************
|
|
||||||
* Copyright (C) 2014-2026 Dennis Sheirer
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
|
||||||
* ****************************************************************************
|
|
||||||
*/
|
|
||||||
|
|
||||||
package io.github.dsheirer.gui.map;
|
|
||||||
|
|
||||||
import java.net.URLEncoder;
|
|
||||||
import java.nio.charset.StandardCharsets;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Free map tile server. A server with a dark style follows the theme; a server without one has its light tiles
|
|
||||||
* recolored in dark themes.
|
|
||||||
* @param id stored in the map preference. Don't change it.
|
|
||||||
* @param name shown to the user
|
|
||||||
* @param lightUrl template of the light style tiles, see {@link TileSource#urlTemplate()}, with a {key} placeholder
|
|
||||||
* when the server needs a key
|
|
||||||
* @param darkUrl template of the dark style tiles, or null when the server has no dark style
|
|
||||||
* @param subdomains for the {s} placeholder, or empty
|
|
||||||
* @param maxZoom highest zoom level the server provides
|
|
||||||
* @param attribution required by the server
|
|
||||||
* @param keyUrl web page where the user gets a free key, or null when the server doesn't need a key
|
|
||||||
*/
|
|
||||||
public record TileServer(String id, String name, String lightUrl, String darkUrl, List<String> subdomains,
|
|
||||||
int maxZoom, String attribution, String keyUrl)
|
|
||||||
{
|
|
||||||
private static final String OSM = "© OpenStreetMap contributors";
|
|
||||||
|
|
||||||
public static final TileServer OPEN_STREET_MAP = new TileServer("osm", "OpenStreetMap",
|
|
||||||
"https://tile.openstreetmap.org/{z}/{x}/{y}.png", null, List.of(), 19, OSM, null);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Positron (light) and Dark Matter (dark). Needs a free key since 25 September 2026: 5 million tiles per month
|
|
||||||
* for non-commercial use.
|
|
||||||
*/
|
|
||||||
public static final TileServer CARTO = new TileServer("carto", "CARTO",
|
|
||||||
"https://basemaps.cartocdn.com/rastertiles/light_all/{z}/{x}/{y}.png?key={key}",
|
|
||||||
"https://basemaps.cartocdn.com/rastertiles/dark_all/{z}/{x}/{y}.png?key={key}", List.of(), 18,
|
|
||||||
OSM + ", © CARTO", "https://carto.com/basemaps/apikey/");
|
|
||||||
|
|
||||||
public static final TileServer ESRI_GRAY = new TileServer("esri.gray", "Esri Gray Canvas",
|
|
||||||
"https://server.arcgisonline.com/ArcGIS/rest/services/Canvas/World_Light_Gray_Base/MapServer/tile/{z}/{y}/{x}",
|
|
||||||
"https://server.arcgisonline.com/ArcGIS/rest/services/Canvas/World_Dark_Gray_Base/MapServer/tile/{z}/{y}/{x}",
|
|
||||||
List.of(), 16, "Tiles © Esri — Esri, HERE, Garmin, " + OSM, null);
|
|
||||||
|
|
||||||
public static final TileServer OPEN_TOPO_MAP = new TileServer("opentopomap", "OpenTopoMap",
|
|
||||||
"https://{s}.tile.opentopomap.org/{z}/{x}/{y}.png", null, List.of("a", "b", "c"), 17,
|
|
||||||
"Map data: " + OSM + ", SRTM | Map style: © OpenTopoMap (CC-BY-SA)", null);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Servers offered to the user, in menu order
|
|
||||||
*/
|
|
||||||
public static final List<TileServer> SERVERS = List.of(OPEN_STREET_MAP, CARTO, ESRI_GRAY, OPEN_TOPO_MAP);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Server with the id
|
|
||||||
* @param id from the map preference, or null
|
|
||||||
* @return server, or OpenStreetMap when there's no server with the id
|
|
||||||
*/
|
|
||||||
public static TileServer get(String id)
|
|
||||||
{
|
|
||||||
return SERVERS.stream().filter(server -> server.id().equals(id)).findFirst().orElse(OPEN_STREET_MAP);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Indicates if the server needs a key from the user
|
|
||||||
*/
|
|
||||||
public boolean requiresKey()
|
|
||||||
{
|
|
||||||
return keyUrl != null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Indicates if the server has its own dark style
|
|
||||||
*/
|
|
||||||
public boolean hasDarkStyle()
|
|
||||||
{
|
|
||||||
return darkUrl != null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Tiles to load for the theme
|
|
||||||
* @param dark true for a dark theme
|
|
||||||
* @param key from the user, for a server that needs one, or null
|
|
||||||
*/
|
|
||||||
public TileSource getSource(boolean dark, String key)
|
|
||||||
{
|
|
||||||
boolean darkStyle = dark && hasDarkStyle();
|
|
||||||
String template = darkStyle ? darkUrl : lightUrl;
|
|
||||||
String cacheName = id + (darkStyle ? "/dark" : "/light");
|
|
||||||
String unavailable = null;
|
|
||||||
|
|
||||||
if(requiresKey())
|
|
||||||
{
|
|
||||||
if(key == null || key.isBlank())
|
|
||||||
{
|
|
||||||
unavailable = name + " needs a free API key: enter it in the map's Settings tab";
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
template = template.replace("{key}", URLEncoder.encode(key.strip(), StandardCharsets.UTF_8));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return new TileSource(cacheName, template, subdomains, maxZoom, dark && !hasDarkStyle(), dark, attribution,
|
|
||||||
unavailable);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String toString()
|
|
||||||
{
|
|
||||||
return name;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,57 +0,0 @@
|
|||||||
/*
|
|
||||||
* *****************************************************************************
|
|
||||||
* Copyright (C) 2014-2026 Dennis Sheirer
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
|
||||||
* ****************************************************************************
|
|
||||||
*/
|
|
||||||
|
|
||||||
package io.github.dsheirer.gui.map;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Tiles the map loads: one style of a {@link TileServer}, resolved for the theme and the user's key.
|
|
||||||
* @param cacheName folder of the tiles in the disk cache, e.g. osm/light
|
|
||||||
* @param urlTemplate with {s} subdomain, {z} zoom, {x} column and {y} row placeholders, or null when unavailable
|
|
||||||
* @param subdomains for the {s} placeholder, or empty
|
|
||||||
* @param maxZoom highest zoom level the server provides. Closer zoom levels enlarge these tiles.
|
|
||||||
* @param darken true to recolor the tiles for a dark theme, for a server without a dark style
|
|
||||||
* @param dark true when the tiles are dark, from a dark style or recolored
|
|
||||||
* @param attribution shown on the map, as the server requires
|
|
||||||
* @param unavailableReason shown instead of tiles when the source can't load tiles, or null
|
|
||||||
*/
|
|
||||||
public record TileSource(String cacheName, String urlTemplate, List<String> subdomains, int maxZoom, boolean darken,
|
|
||||||
boolean dark, String attribution, String unavailableReason)
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Indicates if the source can load tiles
|
|
||||||
*/
|
|
||||||
public boolean isAvailable()
|
|
||||||
{
|
|
||||||
return urlTemplate != null && unavailableReason == null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* URL of the tile. Spreads the tiles over the subdomains by position, so each tile always comes from the same
|
|
||||||
* subdomain and stays in the server's and the browser-style caches.
|
|
||||||
*/
|
|
||||||
public String getUrl(TileKey key)
|
|
||||||
{
|
|
||||||
String subdomain = subdomains.isEmpty() ? "" :
|
|
||||||
subdomains.get(Math.floorMod(key.x() + key.y(), subdomains.size()));
|
|
||||||
return urlTemplate.replace("{s}", subdomain).replace("{z}", String.valueOf(key.zoom()))
|
|
||||||
.replace("{x}", String.valueOf(key.x())).replace("{y}", String.valueOf(key.y()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,228 +0,0 @@
|
|||||||
/*
|
|
||||||
* *****************************************************************************
|
|
||||||
* Copyright (C) 2014-2026 Dennis Sheirer
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
|
||||||
* ****************************************************************************
|
|
||||||
*/
|
|
||||||
|
|
||||||
package io.github.dsheirer.gui.map;
|
|
||||||
|
|
||||||
import io.github.dsheirer.alias.Alias;
|
|
||||||
import io.github.dsheirer.icon.Icon;
|
|
||||||
import io.github.dsheirer.icon.IconModel;
|
|
||||||
import io.github.dsheirer.map.PlottableEntityHistory;
|
|
||||||
import io.github.dsheirer.map.PlottableEntityModel;
|
|
||||||
import io.github.dsheirer.map.TimestampedGeoPosition;
|
|
||||||
import java.util.Collection;
|
|
||||||
import java.util.LinkedHashSet;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Set;
|
|
||||||
import javafx.geometry.VPos;
|
|
||||||
import javafx.scene.canvas.GraphicsContext;
|
|
||||||
import javafx.scene.image.Image;
|
|
||||||
import javafx.scene.paint.Color;
|
|
||||||
import javafx.scene.shape.StrokeLineCap;
|
|
||||||
import javafx.scene.shape.StrokeLineJoin;
|
|
||||||
import javafx.scene.text.Font;
|
|
||||||
import javafx.scene.text.TextAlignment;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Plotted tracks: for each entity, a two-tone trail through its most recent positions, its alias icon at the latest
|
|
||||||
* position and its alias name (or identifier) beside the icon, in the alias color. Use on the JavaFX thread.
|
|
||||||
*/
|
|
||||||
public class TrackLayer implements MapLayer
|
|
||||||
{
|
|
||||||
private static final Color DEFAULT_COLOR = Color.BLUE;
|
|
||||||
private static final Color TRAIL_BACKGROUND = Color.BLACK;
|
|
||||||
private static final Color LABEL_HALO = Color.rgb(255, 255, 255, 0.85);
|
|
||||||
private static final Font LABEL_FONT = Font.font(12);
|
|
||||||
//Map edge allowance for icons and labels that are partly in view
|
|
||||||
private static final double MARGIN = 200;
|
|
||||||
|
|
||||||
private final PlottableEntityModel mEntityModel;
|
|
||||||
private final IconModel mIconModel;
|
|
||||||
private final Set<PlottableEntityHistory> mEntities = new LinkedHashSet<>();
|
|
||||||
private int mTrackHistoryLength = 3;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Constructs an instance
|
|
||||||
* @param entityModel for the entities' aliases
|
|
||||||
* @param iconModel for the alias icons
|
|
||||||
*/
|
|
||||||
public TrackLayer(PlottableEntityModel entityModel, IconModel iconModel)
|
|
||||||
{
|
|
||||||
mEntityModel = entityModel;
|
|
||||||
mIconModel = iconModel;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Number of positions in each trail, including the latest position
|
|
||||||
*/
|
|
||||||
public int getTrackHistoryLength()
|
|
||||||
{
|
|
||||||
return mTrackHistoryLength;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setTrackHistoryLength(int length)
|
|
||||||
{
|
|
||||||
mTrackHistoryLength = length;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Shows the entity
|
|
||||||
* @return true if it wasn't shown
|
|
||||||
*/
|
|
||||||
public boolean add(PlottableEntityHistory entity)
|
|
||||||
{
|
|
||||||
return entity != null && mEntities.add(entity);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Shows the entities
|
|
||||||
* @return true if any wasn't shown
|
|
||||||
*/
|
|
||||||
public boolean addAll(Collection<PlottableEntityHistory> entities)
|
|
||||||
{
|
|
||||||
boolean added = false;
|
|
||||||
|
|
||||||
for(PlottableEntityHistory entity: entities)
|
|
||||||
{
|
|
||||||
added |= add(entity);
|
|
||||||
}
|
|
||||||
|
|
||||||
return added;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Stops showing the entities
|
|
||||||
*/
|
|
||||||
public void removeAll(Collection<PlottableEntityHistory> entities)
|
|
||||||
{
|
|
||||||
mEntities.removeAll(entities);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Stops showing all entities. They're shown again when they report a new position.
|
|
||||||
*/
|
|
||||||
public void clear()
|
|
||||||
{
|
|
||||||
mEntities.clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void draw(GraphicsContext gc, TileMapView map)
|
|
||||||
{
|
|
||||||
MapViewport viewport = map.getViewport();
|
|
||||||
gc.setLineCap(StrokeLineCap.ROUND);
|
|
||||||
gc.setLineJoin(StrokeLineJoin.ROUND);
|
|
||||||
gc.setFont(LABEL_FONT);
|
|
||||||
gc.setTextAlign(TextAlignment.LEFT);
|
|
||||||
gc.setTextBaseline(VPos.CENTER);
|
|
||||||
|
|
||||||
for(PlottableEntityHistory entity: mEntities)
|
|
||||||
{
|
|
||||||
List<TimestampedGeoPosition> history = entity.getTrackHistoryModel().getTrackHistory();
|
|
||||||
|
|
||||||
if(history.isEmpty() || !history.getFirst().isValid())
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
List<Alias> aliases = mEntityModel.getAliases(entity);
|
|
||||||
Alias alias = aliases.isEmpty() ? null : aliases.getFirst();
|
|
||||||
Color color = alias != null ? toColor(alias.getColor()) : DEFAULT_COLOR;
|
|
||||||
|
|
||||||
drawTrail(gc, viewport, history, color);
|
|
||||||
|
|
||||||
TimestampedGeoPosition latest = history.getFirst();
|
|
||||||
double x = viewport.getScreenX(latest.getLongitude());
|
|
||||||
double y = viewport.getScreenY(latest.getLatitude());
|
|
||||||
|
|
||||||
if(x < -MARGIN || x > viewport.getWidth() + MARGIN || y < -MARGIN || y > viewport.getHeight() + MARGIN)
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
double iconWidth = drawIcon(gc, alias, x, y);
|
|
||||||
String label = alias != null ? alias.getName() : String.valueOf(entity.getIdentifier());
|
|
||||||
double labelX = x + iconWidth / 2.0 + 3;
|
|
||||||
gc.setStroke(LABEL_HALO);
|
|
||||||
gc.setLineWidth(3);
|
|
||||||
gc.strokeText(label, labelX, y);
|
|
||||||
gc.setFill(color);
|
|
||||||
gc.fillText(label, labelX, y);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Trail through the most recent positions: a wide black line under a narrow line in the entity's color
|
|
||||||
*/
|
|
||||||
private void drawTrail(GraphicsContext gc, MapViewport viewport, List<TimestampedGeoPosition> history,
|
|
||||||
Color color)
|
|
||||||
{
|
|
||||||
int length = Math.min(history.size(), mTrackHistoryLength);
|
|
||||||
|
|
||||||
if(length < 2)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
double[] xs = new double[length];
|
|
||||||
double[] ys = new double[length];
|
|
||||||
double reference = viewport.getScreenX(history.getFirst().getLongitude());
|
|
||||||
double worldSize = viewport.getWorldSize();
|
|
||||||
|
|
||||||
for(int index = 0; index < length; index++)
|
|
||||||
{
|
|
||||||
TimestampedGeoPosition position = history.get(index);
|
|
||||||
double x = viewport.getScreenX(position.getLongitude());
|
|
||||||
//Keep the trail on the same copy of the world as the latest position
|
|
||||||
xs[index] = x - Math.round((x - reference) / worldSize) * worldSize;
|
|
||||||
ys[index] = viewport.getScreenY(position.getLatitude());
|
|
||||||
}
|
|
||||||
|
|
||||||
gc.setStroke(TRAIL_BACKGROUND);
|
|
||||||
gc.setLineWidth(3);
|
|
||||||
gc.strokePolyline(xs, ys, length);
|
|
||||||
gc.setStroke(color);
|
|
||||||
gc.setLineWidth(1);
|
|
||||||
gc.strokePolyline(xs, ys, length);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Draws the alias icon, or the default icon, centered on the point
|
|
||||||
* @return drawn icon width
|
|
||||||
*/
|
|
||||||
private double drawIcon(GraphicsContext gc, Alias alias, double x, double y)
|
|
||||||
{
|
|
||||||
Icon icon = mIconModel.getIcon(alias != null ? alias.getIconName() : null);
|
|
||||||
Image image = icon != null ? icon.getFxImage() : null;
|
|
||||||
|
|
||||||
if(image == null || image.getHeight() <= 0)
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
double height = IconModel.DEFAULT_ICON_SIZE;
|
|
||||||
double width = image.getWidth() * height / image.getHeight();
|
|
||||||
gc.drawImage(image, x - width / 2.0, y - height / 2.0, width, height);
|
|
||||||
return width;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static Color toColor(int rgb)
|
|
||||||
{
|
|
||||||
return Color.rgb((rgb >> 16) & 0xFF, (rgb >> 8) & 0xFF, rgb & 0xFF);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,90 +0,0 @@
|
|||||||
/*
|
|
||||||
* *****************************************************************************
|
|
||||||
* Copyright (C) 2014-2026 Dennis Sheirer
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
|
||||||
* ****************************************************************************
|
|
||||||
*/
|
|
||||||
|
|
||||||
package io.github.dsheirer.gui.map;
|
|
||||||
|
|
||||||
import io.github.dsheirer.map.GeoPosition;
|
|
||||||
import javafx.scene.canvas.GraphicsContext;
|
|
||||||
import javafx.scene.paint.Color;
|
|
||||||
import javafx.scene.shape.StrokeLineCap;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Push-pin at the user's location, with the tip of the pin at the location. Use on the JavaFX thread.
|
|
||||||
*/
|
|
||||||
public class UserLocationLayer implements MapLayer
|
|
||||||
{
|
|
||||||
private static final Color NEEDLE = Color.rgb(90, 90, 90);
|
|
||||||
private static final Color HEAD = Color.rgb(220, 40, 40);
|
|
||||||
private static final Color HEAD_OUTLINE = Color.rgb(110, 0, 0);
|
|
||||||
private static final Color HIGHLIGHT = Color.rgb(255, 255, 255, 170 / 255.0);
|
|
||||||
private static final Color SHADOW = Color.rgb(0, 0, 0, 70 / 255.0);
|
|
||||||
private static final double NEEDLE_LENGTH = 14.0;
|
|
||||||
private static final double HEAD_RADIUS = 7.0;
|
|
||||||
|
|
||||||
private GeoPosition mPosition;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets the location to mark
|
|
||||||
* @param position of the user, or null to remove the pin
|
|
||||||
*/
|
|
||||||
public void setPosition(GeoPosition position)
|
|
||||||
{
|
|
||||||
mPosition = position;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Location that is marked, or null
|
|
||||||
*/
|
|
||||||
public GeoPosition getPosition()
|
|
||||||
{
|
|
||||||
return mPosition;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void draw(GraphicsContext gc, TileMapView map)
|
|
||||||
{
|
|
||||||
if(mPosition == null)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
MapViewport viewport = map.getViewport();
|
|
||||||
double x = viewport.getScreenX(mPosition.getLongitude());
|
|
||||||
double y = viewport.getScreenY(mPosition.getLatitude());
|
|
||||||
double headY = y - NEEDLE_LENGTH - HEAD_RADIUS;
|
|
||||||
|
|
||||||
//Shadow where the needle enters the map, so the tip reads as the location
|
|
||||||
gc.setFill(SHADOW);
|
|
||||||
gc.fillOval(x - 4, y - 2, 8, 4);
|
|
||||||
|
|
||||||
gc.setStroke(NEEDLE);
|
|
||||||
gc.setLineWidth(2.0);
|
|
||||||
gc.setLineCap(StrokeLineCap.ROUND);
|
|
||||||
gc.strokeLine(x, y, x, headY);
|
|
||||||
|
|
||||||
gc.setFill(HEAD);
|
|
||||||
gc.fillOval(x - HEAD_RADIUS, headY - HEAD_RADIUS, HEAD_RADIUS * 2, HEAD_RADIUS * 2);
|
|
||||||
gc.setStroke(HEAD_OUTLINE);
|
|
||||||
gc.setLineWidth(1.0);
|
|
||||||
gc.strokeOval(x - HEAD_RADIUS, headY - HEAD_RADIUS, HEAD_RADIUS * 2, HEAD_RADIUS * 2);
|
|
||||||
|
|
||||||
gc.setFill(HIGHLIGHT);
|
|
||||||
gc.fillOval(x - HEAD_RADIUS / 2 - 1, headY - HEAD_RADIUS / 2 - 1, 4, 4);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -40,7 +40,6 @@ import io.github.dsheirer.preference.UserPreferences;
|
|||||||
import io.github.dsheirer.preference.identifier.TalkgroupFormatPreference;
|
import io.github.dsheirer.preference.identifier.TalkgroupFormatPreference;
|
||||||
import io.github.dsheirer.sample.Broadcaster;
|
import io.github.dsheirer.sample.Broadcaster;
|
||||||
import io.github.dsheirer.sample.Listener;
|
import io.github.dsheirer.sample.Listener;
|
||||||
import io.github.dsheirer.source.tuner.channel.TunerChannelSource;
|
|
||||||
import java.text.DecimalFormat;
|
import java.text.DecimalFormat;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
@@ -357,36 +356,16 @@ public class ChannelMetadataView extends VBox implements ChannelMetadataModel.Li
|
|||||||
frequency.setCellFactory(NowPlayingCells.formatted(value -> frequencyFormat.format(value / 1e6d)));
|
frequency.setCellFactory(NowPlayingCells.formatted(value -> frequencyFormat.format(value / 1e6d)));
|
||||||
columns.add(frequency);
|
columns.add(frequency);
|
||||||
|
|
||||||
//Tuner that sources the channel
|
|
||||||
columns.add(NowPlayingCells.column("tuner", "Tuner", null, Pos.CENTER,
|
|
||||||
row -> getTunerName(row.getChannelMetadata()), Row::revisionProperty));
|
|
||||||
|
|
||||||
//System and site labels from the channel configuration, hidden by default
|
|
||||||
TableColumn<Row,String> system = NowPlayingCells.column("system", "System", null, Pos.CENTER,
|
|
||||||
row -> toText(row.getChannelMetadata().getSystemConfigurationIdentifier()), Row::revisionProperty);
|
|
||||||
system.setVisible(false);
|
|
||||||
columns.add(system);
|
|
||||||
|
|
||||||
TableColumn<Row,String> site = NowPlayingCells.column("site", "Site", null, Pos.CENTER,
|
|
||||||
row -> toText(row.getChannelMetadata().getSiteConfigurationIdentifier()), Row::revisionProperty);
|
|
||||||
site.setVisible(false);
|
|
||||||
columns.add(site);
|
|
||||||
|
|
||||||
columns.add(NowPlayingCells.column("channel.name", "Channel Name", null, Pos.CENTER,
|
columns.add(NowPlayingCells.column("channel.name", "Channel Name", null, Pos.CENTER,
|
||||||
row -> toText(row.getChannelMetadata().getChannelNameConfigurationIdentifier()), Row::revisionProperty));
|
row -> toText(row.getChannelMetadata().getChannelNameConfigurationIdentifier()), Row::revisionProperty));
|
||||||
|
|
||||||
//Alias list from the channel configuration
|
|
||||||
columns.add(NowPlayingCells.column("alias.list", "Alias List", null, Pos.CENTER,
|
|
||||||
row -> toText(row.getChannelMetadata().getAliasListConfigurationIdentifier()), Row::revisionProperty));
|
|
||||||
|
|
||||||
//The channel rows are in channel start order, the same as the Swing version of the table
|
//The channel rows are in channel start order, the same as the Swing version of the table
|
||||||
for(TableColumn<Row,?> column: columns)
|
for(TableColumn<Row,?> column: columns)
|
||||||
{
|
{
|
||||||
column.setSortable(false);
|
column.setSortable(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
//Column numbers in the Swing version of the table, for its stored column widths. Talker, Tuner, System, Site and Alias
|
//Column numbers in the Swing version of the table, for its stored column widths. Talker is a new column.
|
||||||
//List are new columns.
|
|
||||||
String[] swingColumns = {"status", "decoder", "from", "from.alias", "to", "to.alias", "channel", "frequency",
|
String[] swingColumns = {"status", "decoder", "from", "from.alias", "to", "to.alias", "channel", "frequency",
|
||||||
"channel.name"};
|
"channel.name"};
|
||||||
|
|
||||||
@@ -403,22 +382,6 @@ public class ChannelMetadataView extends VBox implements ChannelMetadataModel.Li
|
|||||||
return columns;
|
return columns;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Name of the tuner that sources the channel, or null if the channel isn't sourced by a tuner.
|
|
||||||
*/
|
|
||||||
private String getTunerName(ChannelMetadata channelMetadata)
|
|
||||||
{
|
|
||||||
Channel channel = mChannelMetadataModel.getChannelFromMetadata(channelMetadata);
|
|
||||||
ProcessingChain processingChain = channel != null ? mChannelProcessingManager.getProcessingChain(channel) : null;
|
|
||||||
|
|
||||||
if(processingChain != null && processingChain.getSource() instanceof TunerChannelSource tunerChannelSource)
|
|
||||||
{
|
|
||||||
return tunerChannelSource.getTunerName();
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Decoder logical channel name with the timeslot, if any
|
* Decoder logical channel name with the timeslot, if any
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -27,7 +27,6 @@ import io.github.dsheirer.gui.playlist.channel.ChannelEditor;
|
|||||||
import io.github.dsheirer.gui.playlist.channel.ChannelTabRequest;
|
import io.github.dsheirer.gui.playlist.channel.ChannelTabRequest;
|
||||||
import io.github.dsheirer.gui.playlist.manager.PlaylistManagerEditor;
|
import io.github.dsheirer.gui.playlist.manager.PlaylistManagerEditor;
|
||||||
import io.github.dsheirer.gui.playlist.radioreference.RadioReferenceEditor;
|
import io.github.dsheirer.gui.playlist.radioreference.RadioReferenceEditor;
|
||||||
import io.github.dsheirer.gui.playlist.radioreference.ViewRadioReferenceRequest;
|
|
||||||
import io.github.dsheirer.gui.playlist.streaming.StreamingEditor;
|
import io.github.dsheirer.gui.playlist.streaming.StreamingEditor;
|
||||||
import io.github.dsheirer.gui.preference.PreferenceEditorType;
|
import io.github.dsheirer.gui.preference.PreferenceEditorType;
|
||||||
import io.github.dsheirer.gui.preference.ViewUserPreferenceEditorRequest;
|
import io.github.dsheirer.gui.preference.ViewUserPreferenceEditorRequest;
|
||||||
@@ -78,7 +77,6 @@ public class PlaylistEditor extends BorderPane
|
|||||||
private Tab mStreamingTab;
|
private Tab mStreamingTab;
|
||||||
private AliasEditor mAliasEditor;
|
private AliasEditor mAliasEditor;
|
||||||
private ChannelEditor mChannelEditor;
|
private ChannelEditor mChannelEditor;
|
||||||
private RadioReferenceEditor mRadioReferenceEditor;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructs an instance
|
* Constructs an instance
|
||||||
@@ -124,13 +122,6 @@ public class PlaylistEditor extends BorderPane
|
|||||||
getChannelEditor().process((ChannelTabRequest)request);
|
getChannelEditor().process((ChannelTabRequest)request);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case RADIOREFERENCE:
|
|
||||||
if(request instanceof ViewRadioReferenceRequest viewRequest)
|
|
||||||
{
|
|
||||||
getTabPane().getSelectionModel().select(getRadioReferenceTab());
|
|
||||||
getRadioReferenceEditor().view(viewRequest);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case PLAYLIST:
|
case PLAYLIST:
|
||||||
//Ignore - this is a request to simply show te playlist editor
|
//Ignore - this is a request to simply show te playlist editor
|
||||||
break;
|
break;
|
||||||
@@ -275,22 +266,12 @@ public class PlaylistEditor extends BorderPane
|
|||||||
if(mRadioReferenceTab == null)
|
if(mRadioReferenceTab == null)
|
||||||
{
|
{
|
||||||
mRadioReferenceTab = new Tab("Radio Reference");
|
mRadioReferenceTab = new Tab("Radio Reference");
|
||||||
mRadioReferenceTab.setContent(getRadioReferenceEditor());
|
mRadioReferenceTab.setContent(new RadioReferenceEditor(mUserPreferences, mPlaylistManager));
|
||||||
}
|
}
|
||||||
|
|
||||||
return mRadioReferenceTab;
|
return mRadioReferenceTab;
|
||||||
}
|
}
|
||||||
|
|
||||||
private RadioReferenceEditor getRadioReferenceEditor()
|
|
||||||
{
|
|
||||||
if(mRadioReferenceEditor == null)
|
|
||||||
{
|
|
||||||
mRadioReferenceEditor = new RadioReferenceEditor(mUserPreferences, mPlaylistManager);
|
|
||||||
}
|
|
||||||
|
|
||||||
return mRadioReferenceEditor;
|
|
||||||
}
|
|
||||||
|
|
||||||
private Tab getStreamingTab()
|
private Tab getStreamingTab()
|
||||||
{
|
{
|
||||||
if(mStreamingTab == null)
|
if(mStreamingTab == null)
|
||||||
|
|||||||
@@ -23,7 +23,6 @@ import com.google.common.eventbus.Subscribe;
|
|||||||
import io.github.dsheirer.alias.Alias;
|
import io.github.dsheirer.alias.Alias;
|
||||||
import io.github.dsheirer.alias.AliasFactory;
|
import io.github.dsheirer.alias.AliasFactory;
|
||||||
import io.github.dsheirer.alias.AliasList;
|
import io.github.dsheirer.alias.AliasList;
|
||||||
import io.github.dsheirer.alias.AliasListConfiguration;
|
|
||||||
import io.github.dsheirer.alias.AliasModel;
|
import io.github.dsheirer.alias.AliasModel;
|
||||||
import io.github.dsheirer.eventbus.MyEventBus;
|
import io.github.dsheirer.eventbus.MyEventBus;
|
||||||
import io.github.dsheirer.gui.control.MaxLengthUnaryOperator;
|
import io.github.dsheirer.gui.control.MaxLengthUnaryOperator;
|
||||||
@@ -34,11 +33,6 @@ import io.github.dsheirer.icon.Icon;
|
|||||||
import io.github.dsheirer.playlist.PlaylistManager;
|
import io.github.dsheirer.playlist.PlaylistManager;
|
||||||
import io.github.dsheirer.preference.PreferenceType;
|
import io.github.dsheirer.preference.PreferenceType;
|
||||||
import io.github.dsheirer.preference.UserPreferences;
|
import io.github.dsheirer.preference.UserPreferences;
|
||||||
import io.github.dsheirer.service.radioreference.AliasListSynchronizer;
|
|
||||||
import java.time.Instant;
|
|
||||||
import java.time.LocalDateTime;
|
|
||||||
import java.time.ZoneId;
|
|
||||||
import java.time.format.DateTimeFormatter;
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
@@ -55,7 +49,6 @@ import javafx.geometry.Pos;
|
|||||||
import javafx.scene.control.Alert;
|
import javafx.scene.control.Alert;
|
||||||
import javafx.scene.control.Button;
|
import javafx.scene.control.Button;
|
||||||
import javafx.scene.control.ButtonType;
|
import javafx.scene.control.ButtonType;
|
||||||
import javafx.scene.control.CheckBox;
|
|
||||||
import javafx.scene.control.ComboBox;
|
import javafx.scene.control.ComboBox;
|
||||||
import javafx.scene.control.Label;
|
import javafx.scene.control.Label;
|
||||||
import javafx.scene.control.MenuButton;
|
import javafx.scene.control.MenuButton;
|
||||||
@@ -69,12 +62,10 @@ import javafx.scene.control.TableView;
|
|||||||
import javafx.scene.control.TextField;
|
import javafx.scene.control.TextField;
|
||||||
import javafx.scene.control.TextFormatter;
|
import javafx.scene.control.TextFormatter;
|
||||||
import javafx.scene.control.TextInputDialog;
|
import javafx.scene.control.TextInputDialog;
|
||||||
import javafx.scene.control.Tooltip;
|
|
||||||
import javafx.scene.control.cell.PropertyValueFactory;
|
import javafx.scene.control.cell.PropertyValueFactory;
|
||||||
import javafx.scene.image.ImageView;
|
import javafx.scene.image.ImageView;
|
||||||
import javafx.scene.layout.HBox;
|
import javafx.scene.layout.HBox;
|
||||||
import javafx.scene.layout.Priority;
|
import javafx.scene.layout.Priority;
|
||||||
import javafx.scene.layout.Region;
|
|
||||||
import javafx.scene.layout.VBox;
|
import javafx.scene.layout.VBox;
|
||||||
import javafx.scene.paint.Color;
|
import javafx.scene.paint.Color;
|
||||||
import javafx.scene.shape.Rectangle;
|
import javafx.scene.shape.Rectangle;
|
||||||
@@ -115,13 +106,6 @@ public class AliasConfigurationEditor extends SplitPane implements IAliasListRef
|
|||||||
private FilteredList<Alias> mAliasFilteredList;
|
private FilteredList<Alias> mAliasFilteredList;
|
||||||
private SortedList<Alias> mAliasSortedList;
|
private SortedList<Alias> mAliasSortedList;
|
||||||
private AliasPredicate mAliasPredicate;
|
private AliasPredicate mAliasPredicate;
|
||||||
private VBox mRadioReferenceBox;
|
|
||||||
private Label mRadioReferenceSystemLabel;
|
|
||||||
private Label mRadioReferenceStatusLabel;
|
|
||||||
private CheckBox mAutoUpdateCheckBox;
|
|
||||||
private Button mRefreshAliasListButton;
|
|
||||||
private boolean mRefreshInProgress;
|
|
||||||
private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructs an instance
|
* Constructs an instance
|
||||||
@@ -136,7 +120,7 @@ public class AliasConfigurationEditor extends SplitPane implements IAliasListRef
|
|||||||
|
|
||||||
VBox leftBox = new VBox();
|
VBox leftBox = new VBox();
|
||||||
VBox.setVgrow(getAliasTableView(), Priority.ALWAYS);
|
VBox.setVgrow(getAliasTableView(), Priority.ALWAYS);
|
||||||
leftBox.getChildren().addAll(getSearchAndListSelectionBox(), getRadioReferenceBox(), getAliasTableView());
|
leftBox.getChildren().addAll(getSearchAndListSelectionBox(), getAliasTableView());
|
||||||
|
|
||||||
HBox topBox = new HBox();
|
HBox topBox = new HBox();
|
||||||
HBox.setHgrow(leftBox, Priority.ALWAYS);
|
HBox.setHgrow(leftBox, Priority.ALWAYS);
|
||||||
@@ -146,191 +130,9 @@ public class AliasConfigurationEditor extends SplitPane implements IAliasListRef
|
|||||||
mCurrentEditor = getAliasItemEditor();
|
mCurrentEditor = getAliasItemEditor();
|
||||||
getItems().addAll(topBox, getAliasItemEditor());
|
getItems().addAll(topBox, getAliasItemEditor());
|
||||||
|
|
||||||
//Configuration changes (e.g. a background Radio Reference check) update the Radio Reference controls
|
|
||||||
mPlaylistManager.getAliasModel().aliasListConfigurations()
|
|
||||||
.addListener((ListChangeListener<AliasListConfiguration>)c -> updateRadioReferenceControls());
|
|
||||||
updateRadioReferenceControls();
|
|
||||||
|
|
||||||
MyEventBus.getGlobalEventBus().register(this);
|
MyEventBus.getGlobalEventBus().register(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Configuration for the alias list selected in the combo box, or null.
|
|
||||||
*/
|
|
||||||
private AliasListConfiguration getSelectedConfiguration()
|
|
||||||
{
|
|
||||||
String aliasListName = getAliasListNameComboBox().getSelectionModel().getSelectedItem();
|
|
||||||
return mPlaylistManager.getAliasModel().getAliasListConfiguration(aliasListName);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Radio Reference system tracking controls for the selected alias list. Disabled when the alias list doesn't
|
|
||||||
* track a Radio Reference system.
|
|
||||||
*/
|
|
||||||
private VBox getRadioReferenceBox()
|
|
||||||
{
|
|
||||||
if(mRadioReferenceBox == null)
|
|
||||||
{
|
|
||||||
//Two rows so that a long system name doesn't push the controls and status off the editor
|
|
||||||
Label label = new Label("Radio Reference:");
|
|
||||||
label.setLabelFor(getRadioReferenceSystemLabel());
|
|
||||||
label.setMinWidth(Region.USE_PREF_SIZE);
|
|
||||||
HBox systemRow = new HBox(10, label, getRadioReferenceSystemLabel());
|
|
||||||
systemRow.setAlignment(Pos.CENTER_LEFT);
|
|
||||||
|
|
||||||
HBox controlsRow = new HBox(10, getAutoUpdateCheckBox(), getRefreshAliasListButton(),
|
|
||||||
getRadioReferenceStatusLabel());
|
|
||||||
controlsRow.setAlignment(Pos.CENTER_LEFT);
|
|
||||||
|
|
||||||
mRadioReferenceBox = new VBox(5, systemRow, controlsRow);
|
|
||||||
mRadioReferenceBox.setPadding(new Insets(0, 0, 10, 10));
|
|
||||||
}
|
|
||||||
|
|
||||||
return mRadioReferenceBox;
|
|
||||||
}
|
|
||||||
|
|
||||||
private Label getRadioReferenceSystemLabel()
|
|
||||||
{
|
|
||||||
if(mRadioReferenceSystemLabel == null)
|
|
||||||
{
|
|
||||||
mRadioReferenceSystemLabel = new Label();
|
|
||||||
}
|
|
||||||
|
|
||||||
return mRadioReferenceSystemLabel;
|
|
||||||
}
|
|
||||||
|
|
||||||
private Label getRadioReferenceStatusLabel()
|
|
||||||
{
|
|
||||||
if(mRadioReferenceStatusLabel == null)
|
|
||||||
{
|
|
||||||
mRadioReferenceStatusLabel = new Label();
|
|
||||||
}
|
|
||||||
|
|
||||||
return mRadioReferenceStatusLabel;
|
|
||||||
}
|
|
||||||
|
|
||||||
private CheckBox getAutoUpdateCheckBox()
|
|
||||||
{
|
|
||||||
if(mAutoUpdateCheckBox == null)
|
|
||||||
{
|
|
||||||
mAutoUpdateCheckBox = new CheckBox("Auto-Update Talkgroups");
|
|
||||||
mAutoUpdateCheckBox.setTooltip(new Tooltip("Automatically add or update talkgroup aliases when the " +
|
|
||||||
"system changes on Radio Reference. Set how often to check in User Preferences > Radio Reference > Alias Lists."));
|
|
||||||
mAutoUpdateCheckBox.setOnAction(event -> {
|
|
||||||
AliasListConfiguration configuration = getSelectedConfiguration();
|
|
||||||
|
|
||||||
if(configuration != null && configuration.isTrackingRadioReferenceSystem())
|
|
||||||
{
|
|
||||||
configuration.setAutoUpdate(getAutoUpdateCheckBox().isSelected());
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
return mAutoUpdateCheckBox;
|
|
||||||
}
|
|
||||||
|
|
||||||
private Button getRefreshAliasListButton()
|
|
||||||
{
|
|
||||||
if(mRefreshAliasListButton == null)
|
|
||||||
{
|
|
||||||
mRefreshAliasListButton = new Button("Refresh Now");
|
|
||||||
mRefreshAliasListButton.setTooltip(new Tooltip("Add or update talkgroup aliases from Radio Reference now"));
|
|
||||||
mRefreshAliasListButton.setOnAction(event -> {
|
|
||||||
AliasListConfiguration configuration = getSelectedConfiguration();
|
|
||||||
|
|
||||||
if(configuration == null || !configuration.isTrackingRadioReferenceSystem())
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
mRefreshInProgress = true;
|
|
||||||
updateRadioReferenceControls();
|
|
||||||
getRadioReferenceStatusLabel().setText("Refreshing from Radio Reference...");
|
|
||||||
|
|
||||||
mPlaylistManager.getAliasListSynchronizer().refresh(configuration)
|
|
||||||
.whenComplete((result, throwable) -> Platform.runLater(() -> {
|
|
||||||
mRefreshInProgress = false;
|
|
||||||
updateRadioReferenceControls();
|
|
||||||
|
|
||||||
if(throwable != null)
|
|
||||||
{
|
|
||||||
Alert alert = new Alert(Alert.AlertType.ERROR, "Unable to refresh alias list [" +
|
|
||||||
configuration.getName() + "] from Radio Reference.\n\n" +
|
|
||||||
AliasListSynchronizer.getMessage(throwable), ButtonType.OK);
|
|
||||||
alert.setTitle("Refresh Alias List");
|
|
||||||
alert.setHeaderText("Radio Reference Refresh Failed");
|
|
||||||
alert.initOwner(getRefreshAliasListButton().getScene().getWindow());
|
|
||||||
alert.show();
|
|
||||||
}
|
|
||||||
else if(result != null && result.applied() && configuration == getSelectedConfiguration())
|
|
||||||
{
|
|
||||||
getRadioReferenceStatusLabel().setText("Added " + result.added() + ", updated " +
|
|
||||||
result.updated() + " aliases. " + getStatusText(configuration));
|
|
||||||
}
|
|
||||||
}));
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
return mRefreshAliasListButton;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Updates the Radio Reference controls for the currently selected alias list.
|
|
||||||
*/
|
|
||||||
private void updateRadioReferenceControls()
|
|
||||||
{
|
|
||||||
AliasListConfiguration configuration = getSelectedConfiguration();
|
|
||||||
boolean tracking = configuration != null && configuration.isTrackingRadioReferenceSystem();
|
|
||||||
|
|
||||||
getAutoUpdateCheckBox().setDisable(!tracking);
|
|
||||||
getAutoUpdateCheckBox().setSelected(tracking && configuration.isAutoUpdate());
|
|
||||||
getRefreshAliasListButton().setDisable(!tracking || mRefreshInProgress);
|
|
||||||
|
|
||||||
if(tracking)
|
|
||||||
{
|
|
||||||
String name = configuration.getRadioReferenceSystemName();
|
|
||||||
getRadioReferenceSystemLabel().setText((name != null && !name.isEmpty() ? name : "System") + " [" +
|
|
||||||
configuration.getRadioReferenceSystemId() + "]");
|
|
||||||
|
|
||||||
if(!mRefreshInProgress)
|
|
||||||
{
|
|
||||||
getRadioReferenceStatusLabel().setText(getStatusText(configuration));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
getRadioReferenceSystemLabel().setText("Not tracking a system");
|
|
||||||
getRadioReferenceStatusLabel().setText(null);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Status text for a tracked alias list: Radio Reference last updated and synchronized timestamps.
|
|
||||||
*/
|
|
||||||
private static String getStatusText(AliasListConfiguration configuration)
|
|
||||||
{
|
|
||||||
StringBuilder sb = new StringBuilder();
|
|
||||||
sb.append("Updated on Radio Reference: ").append(format(configuration.getRadioReferenceLastUpdated()));
|
|
||||||
sb.append(" Synchronized: ").append(format(configuration.getSynchronizedLastUpdated()));
|
|
||||||
|
|
||||||
if(configuration.isUpdateAvailable())
|
|
||||||
{
|
|
||||||
sb.append(" (Update Available)");
|
|
||||||
}
|
|
||||||
|
|
||||||
return sb.toString();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static String format(long timestamp)
|
|
||||||
{
|
|
||||||
if(timestamp <= 0)
|
|
||||||
{
|
|
||||||
return "never";
|
|
||||||
}
|
|
||||||
|
|
||||||
return DATE_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(timestamp), ZoneId.systemDefault()));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Redraws the alias color swatches after a change to the application theme.
|
* Redraws the alias color swatches after a change to the application theme.
|
||||||
*/
|
*/
|
||||||
@@ -529,7 +331,6 @@ public class AliasConfigurationEditor extends SplitPane implements IAliasListRef
|
|||||||
{
|
{
|
||||||
getNewAliasButton().setDisable(newValue == null || newValue.contentEquals(AliasModel.NO_ALIAS_LIST));
|
getNewAliasButton().setDisable(newValue == null || newValue.contentEquals(AliasModel.NO_ALIAS_LIST));
|
||||||
update();
|
update();
|
||||||
updateRadioReferenceControls();
|
|
||||||
});
|
});
|
||||||
|
|
||||||
if(mAliasListNameComboBox.getItems().size() > 1)
|
if(mAliasListNameComboBox.getItems().size() > 1)
|
||||||
|
|||||||
@@ -96,7 +96,6 @@ public abstract class ChannelConfigurationEditor extends Editor<Channel>
|
|||||||
private TextField mNameField;
|
private TextField mNameField;
|
||||||
private ComboBox<String> mAliasListComboBox;
|
private ComboBox<String> mAliasListComboBox;
|
||||||
private Button mNewAliasListButton;
|
private Button mNewAliasListButton;
|
||||||
private CheckBox mAutoAddTalkerAliasesCheckBox;
|
|
||||||
private GridPane mTextFieldPane;
|
private GridPane mTextFieldPane;
|
||||||
private Button mSaveButton;
|
private Button mSaveButton;
|
||||||
private Button mResetButton;
|
private Button mResetButton;
|
||||||
@@ -188,7 +187,6 @@ public abstract class ChannelConfigurationEditor extends Editor<Channel>
|
|||||||
getNameField().setDisable(disable);
|
getNameField().setDisable(disable);
|
||||||
getAliasListComboBox().setDisable(disable);
|
getAliasListComboBox().setDisable(disable);
|
||||||
getNewAliasListButton().setDisable(disable);
|
getNewAliasListButton().setDisable(disable);
|
||||||
getAutoAddTalkerAliasesCheckBox().setDisable(disable);
|
|
||||||
getAutoStartSwitch().setDisable(disable);
|
getAutoStartSwitch().setDisable(disable);
|
||||||
|
|
||||||
if(channel != null)
|
if(channel != null)
|
||||||
@@ -212,7 +210,6 @@ public abstract class ChannelConfigurationEditor extends Editor<Channel>
|
|||||||
getAliasListComboBox().getSelectionModel().select(null);
|
getAliasListComboBox().getSelectionModel().select(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
getAutoAddTalkerAliasesCheckBox().setSelected(channel.isAutoAddTalkerAliases());
|
|
||||||
getAutoStartSwitch().selectedProperty().set(channel.isAutoStart());
|
getAutoStartSwitch().selectedProperty().set(channel.isAutoStart());
|
||||||
getAutoStartOrderSpinner().setDisable(!channel.isAutoStart());
|
getAutoStartOrderSpinner().setDisable(!channel.isAutoStart());
|
||||||
Integer order = channel.getAutoStartOrder();
|
Integer order = channel.getAutoStartOrder();
|
||||||
@@ -254,7 +251,6 @@ public abstract class ChannelConfigurationEditor extends Editor<Channel>
|
|||||||
getSiteField().setText(null);
|
getSiteField().setText(null);
|
||||||
getNameField().setText(null);
|
getNameField().setText(null);
|
||||||
getAliasListComboBox().getSelectionModel().select(null);
|
getAliasListComboBox().getSelectionModel().select(null);
|
||||||
getAutoAddTalkerAliasesCheckBox().setSelected(false);
|
|
||||||
getAutoStartSwitch().selectedProperty().set(false);
|
getAutoStartSwitch().selectedProperty().set(false);
|
||||||
getAutoStartOrderSpinner().setDisable(true);
|
getAutoStartOrderSpinner().setDisable(true);
|
||||||
getAutoStartOrderSpinner().getValueFactory().setValue(0);
|
getAutoStartOrderSpinner().getValueFactory().setValue(0);
|
||||||
@@ -281,12 +277,6 @@ public abstract class ChannelConfigurationEditor extends Editor<Channel>
|
|||||||
getItem().setName(" ");
|
getItem().setName(" ");
|
||||||
getItem().setName(getNameField().getText());
|
getItem().setName(getNameField().getText());
|
||||||
getItem().setAliasListName(getAliasListComboBox().getSelectionModel().getSelectedItem());
|
getItem().setAliasListName(getAliasListComboBox().getSelectionModel().getSelectedItem());
|
||||||
|
|
||||||
if(providesTalkerAlias())
|
|
||||||
{
|
|
||||||
getItem().setAutoAddTalkerAliases(getAutoAddTalkerAliasesCheckBox().isSelected());
|
|
||||||
}
|
|
||||||
|
|
||||||
getItem().setAutoStart(getAutoStartSwitch().isSelected());
|
getItem().setAutoStart(getAutoStartSwitch().isSelected());
|
||||||
|
|
||||||
Integer order = getAutoStartOrderSpinner().getValue();
|
Integer order = getAutoStartOrderSpinner().getValue();
|
||||||
@@ -608,12 +598,6 @@ public abstract class ChannelConfigurationEditor extends Editor<Channel>
|
|||||||
|
|
||||||
GridPane.setConstraints(getNewAliasListButton(), 4, row);
|
GridPane.setConstraints(getNewAliasListButton(), 4, row);
|
||||||
mTextFieldPane.getChildren().add(getNewAliasListButton());
|
mTextFieldPane.getChildren().add(getNewAliasListButton());
|
||||||
|
|
||||||
if(providesTalkerAlias())
|
|
||||||
{
|
|
||||||
GridPane.setConstraints(getAutoAddTalkerAliasesCheckBox(), 3, ++row, 2, 1);
|
|
||||||
mTextFieldPane.getChildren().add(getAutoAddTalkerAliasesCheckBox());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return mTextFieldPane;
|
return mTextFieldPane;
|
||||||
@@ -676,32 +660,6 @@ public abstract class ChannelConfigurationEditor extends Editor<Channel>
|
|||||||
return mAliasListComboBox;
|
return mAliasListComboBox;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Indicates if the decoder for this editor produces talker aliases.
|
|
||||||
*/
|
|
||||||
private boolean providesTalkerAlias()
|
|
||||||
{
|
|
||||||
return getDecoderType() != null && getDecoderType().providesTalkerAlias();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check box to automatically add decoded talker aliases to the selected alias list.
|
|
||||||
*/
|
|
||||||
private CheckBox getAutoAddTalkerAliasesCheckBox()
|
|
||||||
{
|
|
||||||
if(mAutoAddTalkerAliasesCheckBox == null)
|
|
||||||
{
|
|
||||||
mAutoAddTalkerAliasesCheckBox = new CheckBox("Auto-Add Talker Aliases");
|
|
||||||
mAutoAddTalkerAliasesCheckBox.setDisable(true);
|
|
||||||
mAutoAddTalkerAliasesCheckBox.setTooltip(new Tooltip("Adds a radio alias for each talker alias decoded " +
|
|
||||||
"on this system, named with the talker alias, and renames the radio alias when its talker alias " +
|
|
||||||
"changes. Applies when the channel is (re)started."));
|
|
||||||
mAutoAddTalkerAliasesCheckBox.setOnAction(event -> modifiedProperty().set(true));
|
|
||||||
}
|
|
||||||
|
|
||||||
return mAutoAddTalkerAliasesCheckBox;
|
|
||||||
}
|
|
||||||
|
|
||||||
private Button getNewAliasListButton()
|
private Button getNewAliasListButton()
|
||||||
{
|
{
|
||||||
if(mNewAliasListButton == null)
|
if(mNewAliasListButton == null)
|
||||||
|
|||||||
@@ -55,8 +55,6 @@ public class AgencyEditor extends VBox
|
|||||||
private ListView<Agency> mAgencyListView;
|
private ListView<Agency> mAgencyListView;
|
||||||
private AgencyFrequencyEditor mAgencyFrequencyEditor;
|
private AgencyFrequencyEditor mAgencyFrequencyEditor;
|
||||||
private IntegerProperty mAgencyCountProperty = new SimpleIntegerProperty();
|
private IntegerProperty mAgencyCountProperty = new SimpleIntegerProperty();
|
||||||
private Integer mPendingAgencyId;
|
|
||||||
private AgencyFrequencyEditor.FrequencyTarget mPendingFrequency;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructs an instance
|
* Constructs an instance
|
||||||
@@ -111,56 +109,6 @@ public class AgencyEditor extends VBox
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Prepares to show the agency with the frequency selected when the agencies are next set
|
|
||||||
* @param agencyId of the agency, or the negative county id for a county's own frequencies
|
|
||||||
* @param frequency to select, or null
|
|
||||||
*/
|
|
||||||
public void prepareView(int agencyId, AgencyFrequencyEditor.FrequencyTarget frequency)
|
|
||||||
{
|
|
||||||
mUserPreferences.getRadioReferencePreference().setPreferredAgencyId(agencyId, mLevel);
|
|
||||||
mPendingAgencyId = agencyId;
|
|
||||||
mPendingFrequency = frequency;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Shows the agency with the frequency selected
|
|
||||||
* @param agencyId of the agency, or the negative county id for a county's own frequencies
|
|
||||||
* @param frequency to select, or null
|
|
||||||
* @return false when the editor doesn't list the agency
|
|
||||||
*/
|
|
||||||
public boolean view(int agencyId, AgencyFrequencyEditor.FrequencyTarget frequency)
|
|
||||||
{
|
|
||||||
prepareView(agencyId, frequency);
|
|
||||||
|
|
||||||
for(Agency agency: getAgencyListView().getItems())
|
|
||||||
{
|
|
||||||
if(agency.getAgencyId() == agencyId)
|
|
||||||
{
|
|
||||||
if(getAgencyListView().getSelectionModel().getSelectedItem() == agency)
|
|
||||||
{
|
|
||||||
//Already shown - select the frequency in the shown categories
|
|
||||||
mPendingAgencyId = null;
|
|
||||||
mPendingFrequency = null;
|
|
||||||
|
|
||||||
if(frequency != null)
|
|
||||||
{
|
|
||||||
getAgencyFrequencyEditor().viewFrequency(frequency);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
getAgencyListView().getSelectionModel().select(agency);
|
|
||||||
}
|
|
||||||
|
|
||||||
getAgencyListView().scrollTo(agency);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return getAgencyListView().getItems().isEmpty();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void clear()
|
public void clear()
|
||||||
{
|
{
|
||||||
getAgencyListView().getItems().clear();
|
getAgencyListView().getItems().clear();
|
||||||
@@ -207,17 +155,6 @@ public class AgencyEditor extends VBox
|
|||||||
{
|
{
|
||||||
getAgencyFrequencyEditor().clearAndSetLoading();
|
getAgencyFrequencyEditor().clearAndSetLoading();
|
||||||
|
|
||||||
if(mPendingAgencyId != null && mPendingAgencyId == agency.getAgencyId())
|
|
||||||
{
|
|
||||||
if(mPendingFrequency != null)
|
|
||||||
{
|
|
||||||
getAgencyFrequencyEditor().viewFrequency(mPendingFrequency);
|
|
||||||
}
|
|
||||||
|
|
||||||
mPendingAgencyId = null;
|
|
||||||
mPendingFrequency = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
mUserPreferences.getRadioReferencePreference().setPreferredAgencyId(agency.getAgencyId(), mLevel);
|
mUserPreferences.getRadioReferencePreference().setPreferredAgencyId(agency.getAgencyId(), mLevel);
|
||||||
|
|
||||||
ThreadPool.CACHED.submit(() -> {
|
ThreadPool.CACHED.submit(() -> {
|
||||||
|
|||||||
@@ -68,21 +68,6 @@ public class AgencyFrequencyEditor extends GridPane
|
|||||||
private Level mLevel;
|
private Level mLevel;
|
||||||
private ComboBox<Category> mCategoryComboBox;
|
private ComboBox<Category> mCategoryComboBox;
|
||||||
private ComboBox<SubCategory> mSubCategoryComboBox;
|
private ComboBox<SubCategory> mSubCategoryComboBox;
|
||||||
private FrequencyTarget mPendingFrequency;
|
|
||||||
private boolean mLoadingFrequencies;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Frequency to select in the editor
|
|
||||||
* @param category name, or null
|
|
||||||
* @param subCategory name, or null
|
|
||||||
* @param frequencyHz downlink frequency
|
|
||||||
* @param description of the frequency, or null
|
|
||||||
* @param alphaTag of the frequency, or null
|
|
||||||
*/
|
|
||||||
public record FrequencyTarget(String category, String subCategory, long frequencyHz, String description,
|
|
||||||
String alphaTag)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
private TableView<Frequency> mFrequencyTableView;
|
private TableView<Frequency> mFrequencyTableView;
|
||||||
private Label mPlaceholderLabel;
|
private Label mPlaceholderLabel;
|
||||||
private ProgressIndicator mProgressIndicator;
|
private ProgressIndicator mProgressIndicator;
|
||||||
@@ -180,127 +165,14 @@ public class AgencyFrequencyEditor extends GridPane
|
|||||||
sorted.add(0, ALL_CATEGORIES);
|
sorted.add(0, ALL_CATEGORIES);
|
||||||
}
|
}
|
||||||
getCategoryComboBox().getItems().addAll(sorted);
|
getCategoryComboBox().getItems().addAll(sorted);
|
||||||
|
|
||||||
if(mPendingFrequency == null || !selectPendingFrequency())
|
|
||||||
{
|
|
||||||
getCategoryComboBox().getSelectionModel().select(sorted.get(0));
|
getCategoryComboBox().getSelectionModel().select(sorted.get(0));
|
||||||
}
|
}
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
setLoading(false);
|
setLoading(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Selects the frequency in its category and subcategory, now or once the categories are set
|
|
||||||
*/
|
|
||||||
public void viewFrequency(FrequencyTarget target)
|
|
||||||
{
|
|
||||||
mPendingFrequency = target;
|
|
||||||
|
|
||||||
if(!getCategoryComboBox().getItems().isEmpty())
|
|
||||||
{
|
|
||||||
selectPendingFrequency();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Selects the pending frequency's category and subcategory, which loads the frequencies, or selects the frequency
|
|
||||||
* when they're already shown.
|
|
||||||
* @return false when the categories don't include the frequency's category
|
|
||||||
*/
|
|
||||||
private boolean selectPendingFrequency()
|
|
||||||
{
|
|
||||||
FrequencyTarget target = mPendingFrequency;
|
|
||||||
Category category = null;
|
|
||||||
|
|
||||||
for(Category candidate: getCategoryComboBox().getItems())
|
|
||||||
{
|
|
||||||
if(candidate != ALL_CATEGORIES && candidate.getName() != null &&
|
|
||||||
candidate.getName().equals(target.category()))
|
|
||||||
{
|
|
||||||
category = candidate;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(category == null)
|
|
||||||
{
|
|
||||||
mPendingFrequency = null;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(getCategoryComboBox().getValue() != category)
|
|
||||||
{
|
|
||||||
getCategoryComboBox().getSelectionModel().select(category);
|
|
||||||
}
|
|
||||||
|
|
||||||
SubCategory subCategory = null;
|
|
||||||
|
|
||||||
for(SubCategory candidate: getSubCategoryComboBox().getItems())
|
|
||||||
{
|
|
||||||
if(candidate != ALL_SUB_CATEGORIES && candidate.getName() != null &&
|
|
||||||
candidate.getName().equals(target.subCategory()))
|
|
||||||
{
|
|
||||||
subCategory = candidate;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(subCategory != null && getSubCategoryComboBox().getValue() != subCategory)
|
|
||||||
{
|
|
||||||
//Loading the subcategory frequencies selects the frequency
|
|
||||||
getSubCategoryComboBox().getSelectionModel().select(subCategory);
|
|
||||||
}
|
|
||||||
else if(!mLoadingFrequencies)
|
|
||||||
{
|
|
||||||
selectFrequency();
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Selects the pending frequency in the frequencies table: the one with the same description or alpha tag, or else
|
|
||||||
* the first one with the same frequency
|
|
||||||
*/
|
|
||||||
private void selectFrequency()
|
|
||||||
{
|
|
||||||
FrequencyTarget target = mPendingFrequency;
|
|
||||||
mPendingFrequency = null;
|
|
||||||
|
|
||||||
if(target == null)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
Frequency match = null;
|
|
||||||
|
|
||||||
for(Frequency frequency: getFrequencyTableView().getItems())
|
|
||||||
{
|
|
||||||
if(frequency.getDownlinkHz() == target.frequencyHz())
|
|
||||||
{
|
|
||||||
boolean same = (target.description() != null && target.description().equals(frequency.getDescription())) ||
|
|
||||||
(target.alphaTag() != null && target.alphaTag().equals(frequency.getAlphaTag()));
|
|
||||||
|
|
||||||
if(same)
|
|
||||||
{
|
|
||||||
match = frequency;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
else if(match == null)
|
|
||||||
{
|
|
||||||
match = frequency;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(match != null)
|
|
||||||
{
|
|
||||||
getFrequencyTableView().getSelectionModel().select(match);
|
|
||||||
getFrequencyTableView().scrollTo(match);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private FrequencyEditor getFrequencyEditor()
|
private FrequencyEditor getFrequencyEditor()
|
||||||
{
|
{
|
||||||
if(mFrequencyEditor == null)
|
if(mFrequencyEditor == null)
|
||||||
@@ -528,7 +400,6 @@ public class AgencyFrequencyEditor extends GridPane
|
|||||||
getFrequencyTableView().getItems().clear();
|
getFrequencyTableView().getItems().clear();
|
||||||
|
|
||||||
SubCategory subCategory = mSubCategoryComboBox.getValue();
|
SubCategory subCategory = mSubCategoryComboBox.getValue();
|
||||||
mLoadingFrequencies = subCategory != null;
|
|
||||||
|
|
||||||
if(subCategory != null)
|
if(subCategory != null)
|
||||||
{
|
{
|
||||||
@@ -582,23 +453,14 @@ public class AgencyFrequencyEditor extends GridPane
|
|||||||
}
|
}
|
||||||
|
|
||||||
Platform.runLater(() -> {
|
Platform.runLater(() -> {
|
||||||
//Another subcategory was selected while loading - its frequencies are shown instead
|
|
||||||
if(getSubCategoryComboBox().getValue() != subCategory)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
mLoadingFrequencies = false;
|
|
||||||
getFrequencyTableView().getItems().addAll(frequencies);
|
getFrequencyTableView().getItems().addAll(frequencies);
|
||||||
setLoading(false);
|
setLoading(false);
|
||||||
selectFrequency();
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
catch(Throwable t)
|
catch(Throwable t)
|
||||||
{
|
{
|
||||||
mLog.error("Error retrieving frequencies for subcategory [" + subCategory.getName() + "]", t);
|
mLog.error("Error retrieving frequencies for subcategory [" + subCategory.getName() + "]", t);
|
||||||
Platform.runLater(() -> {
|
Platform.runLater(() -> {
|
||||||
mLoadingFrequencies = false;
|
|
||||||
setLoading(false);
|
setLoading(false);
|
||||||
new RadioReferenceUnavailableAlert(getSubCategoryComboBox()).showAndWait();
|
new RadioReferenceUnavailableAlert(getSubCategoryComboBox()).showAndWait();
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -26,17 +26,12 @@ import io.github.dsheirer.preference.PreferenceType;
|
|||||||
import io.github.dsheirer.preference.UserPreferences;
|
import io.github.dsheirer.preference.UserPreferences;
|
||||||
import io.github.dsheirer.preference.radioreference.RadioReferencePreference;
|
import io.github.dsheirer.preference.radioreference.RadioReferencePreference;
|
||||||
import io.github.dsheirer.rrapi.RadioReferenceException;
|
import io.github.dsheirer.rrapi.RadioReferenceException;
|
||||||
import io.github.dsheirer.rrapi.RadioReferenceService;
|
|
||||||
import io.github.dsheirer.rrapi.type.AgencyInfo;
|
|
||||||
import io.github.dsheirer.rrapi.type.Agency;
|
import io.github.dsheirer.rrapi.type.Agency;
|
||||||
import io.github.dsheirer.rrapi.type.AuthorizationInformation;
|
import io.github.dsheirer.rrapi.type.AuthorizationInformation;
|
||||||
import io.github.dsheirer.rrapi.type.Country;
|
import io.github.dsheirer.rrapi.type.Country;
|
||||||
import io.github.dsheirer.rrapi.type.CountryInfo;
|
import io.github.dsheirer.rrapi.type.CountryInfo;
|
||||||
import io.github.dsheirer.rrapi.type.County;
|
import io.github.dsheirer.rrapi.type.County;
|
||||||
import io.github.dsheirer.rrapi.type.CountyInfo;
|
import io.github.dsheirer.rrapi.type.CountyInfo;
|
||||||
import io.github.dsheirer.rrapi.type.Site;
|
|
||||||
import io.github.dsheirer.rrapi.type.SystemInformation;
|
|
||||||
import io.github.dsheirer.service.radioreference.FrequencyCandidate;
|
|
||||||
import io.github.dsheirer.rrapi.type.State;
|
import io.github.dsheirer.rrapi.type.State;
|
||||||
import io.github.dsheirer.rrapi.type.StateInfo;
|
import io.github.dsheirer.rrapi.type.StateInfo;
|
||||||
import io.github.dsheirer.service.radioreference.RadioReference;
|
import io.github.dsheirer.service.radioreference.RadioReference;
|
||||||
@@ -46,9 +41,7 @@ import javafx.application.Platform;
|
|||||||
import javafx.beans.binding.Bindings;
|
import javafx.beans.binding.Bindings;
|
||||||
import javafx.geometry.Insets;
|
import javafx.geometry.Insets;
|
||||||
import javafx.geometry.Pos;
|
import javafx.geometry.Pos;
|
||||||
import javafx.scene.control.Alert;
|
|
||||||
import javafx.scene.control.Button;
|
import javafx.scene.control.Button;
|
||||||
import javafx.scene.control.ButtonType;
|
|
||||||
import javafx.scene.control.ComboBox;
|
import javafx.scene.control.ComboBox;
|
||||||
import javafx.scene.control.Label;
|
import javafx.scene.control.Label;
|
||||||
import javafx.scene.control.Tab;
|
import javafx.scene.control.Tab;
|
||||||
@@ -69,9 +62,7 @@ import org.slf4j.Logger;
|
|||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.LinkedHashSet;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
|
||||||
import java.util.concurrent.atomic.AtomicLong;
|
import java.util.concurrent.atomic.AtomicLong;
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
|
|
||||||
@@ -177,6 +168,8 @@ public class RadioReferenceEditor extends BorderPane implements Consumer<Authori
|
|||||||
{
|
{
|
||||||
getCountryComboBox().getItems().clear();
|
getCountryComboBox().getItems().clear();
|
||||||
|
|
||||||
|
final int preferredCountryId = mUserPreferences.getRadioReferencePreference().getPreferredCountryId();
|
||||||
|
|
||||||
ThreadPool.CACHED.execute(() -> {
|
ThreadPool.CACHED.execute(() -> {
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@@ -184,8 +177,6 @@ public class RadioReferenceEditor extends BorderPane implements Consumer<Authori
|
|||||||
|
|
||||||
Platform.runLater(() -> {
|
Platform.runLater(() -> {
|
||||||
getCountryComboBox().getItems().addAll(countries);
|
getCountryComboBox().getItems().addAll(countries);
|
||||||
//Read when the list arrives, so a view request made while loading is honored
|
|
||||||
int preferredCountryId = mUserPreferences.getRadioReferencePreference().getPreferredCountryId();
|
|
||||||
|
|
||||||
if(preferredCountryId >= 0)
|
if(preferredCountryId >= 0)
|
||||||
{
|
{
|
||||||
@@ -208,342 +199,6 @@ public class RadioReferenceEditor extends BorderPane implements Consumer<Authori
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Where a view request's system or frequency is listed in the editor
|
|
||||||
* @param countryId of the country
|
|
||||||
* @param stateId of the state
|
|
||||||
* @param countyId of the county, or 0 for a state level listing
|
|
||||||
* @param level of the listing: COUNTY or STATE
|
|
||||||
* @param systemId of the trunked system, or null for an agency
|
|
||||||
* @param siteId of the site to select, or -1
|
|
||||||
* @param agencyId of the agency, or the negative county id for a county's own frequencies, or null for a system
|
|
||||||
* @param frequency to select in the agency, or null
|
|
||||||
*/
|
|
||||||
private record ViewTarget(int countryId, int stateId, int countyId, Level level, Integer systemId, int siteId,
|
|
||||||
Integer agencyId, AgencyFrequencyEditor.FrequencyTarget frequency)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Shows the request's trunked system site or conventional frequency: selects its country, state and county, the
|
|
||||||
* tab that lists it, and the system and site or the agency and frequency. Finds where it's listed in the
|
|
||||||
* background.
|
|
||||||
*/
|
|
||||||
public void view(ViewRadioReferenceRequest request)
|
|
||||||
{
|
|
||||||
ThreadPool.CACHED.execute(() -> {
|
|
||||||
try
|
|
||||||
{
|
|
||||||
ViewTarget target = resolve(request);
|
|
||||||
|
|
||||||
Platform.runLater(() -> {
|
|
||||||
if(target == null)
|
|
||||||
{
|
|
||||||
showViewError("Radio Reference doesn't list where this " +
|
|
||||||
(request.getSystemId() != null ? "system" : "frequency") + " is listed.");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
navigate(target);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
catch(RadioReferenceException rre)
|
|
||||||
{
|
|
||||||
mLog.error("Error finding radio reference listing to view - " + rre.getMessage());
|
|
||||||
Platform.runLater(() -> new RadioReferenceUnavailableAlert(getTabPane()).showAndWait());
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Finds where the request's system or frequency is listed. Call from a background thread.
|
|
||||||
* @return target, or null when it can't be found
|
|
||||||
*/
|
|
||||||
private ViewTarget resolve(ViewRadioReferenceRequest request) throws RadioReferenceException
|
|
||||||
{
|
|
||||||
RadioReferenceService service = mRadioReference.getService();
|
|
||||||
|
|
||||||
if(request.getSystemId() != null)
|
|
||||||
{
|
|
||||||
int systemId = request.getSystemId();
|
|
||||||
int siteId = request.getSiteId() != null ? request.getSiteId() : -1;
|
|
||||||
//The site's county first, then the system's counties, then its states
|
|
||||||
Set<Integer> countyIds = new LinkedHashSet<>();
|
|
||||||
|
|
||||||
for(Site site: nonNull(service.getSites(systemId)))
|
|
||||||
{
|
|
||||||
if(site.getSiteId() == siteId && isCounty(site.getCountyId()))
|
|
||||||
{
|
|
||||||
countyIds.add(site.getCountyId());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
SystemInformation systemInformation = service.getSystemInformation(systemId);
|
|
||||||
|
|
||||||
if(systemInformation != null)
|
|
||||||
{
|
|
||||||
for(County county: nonNull(systemInformation.getCounties()))
|
|
||||||
{
|
|
||||||
if(isCounty(county.getCountyId()))
|
|
||||||
{
|
|
||||||
countyIds.add(county.getCountyId());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//Limit the requests for systems that span many counties
|
|
||||||
int checked = 0;
|
|
||||||
|
|
||||||
for(Integer countyId: countyIds)
|
|
||||||
{
|
|
||||||
if(checked++ >= 10)
|
|
||||||
{
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
CountyInfo countyInfo = service.getCountyInfo(countyId);
|
|
||||||
|
|
||||||
if(countyInfo != null && nonNull(countyInfo.getSystems()).stream()
|
|
||||||
.anyMatch(system -> system.getSystemId() == systemId))
|
|
||||||
{
|
|
||||||
return new ViewTarget(getCountryId(service, countyInfo.getStateId()), countyInfo.getStateId(),
|
|
||||||
countyId, Level.COUNTY, systemId, siteId, null, null);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(systemInformation != null)
|
|
||||||
{
|
|
||||||
for(State state: nonNull(systemInformation.getStates()))
|
|
||||||
{
|
|
||||||
StateInfo stateInfo = service.getStateInfo(state.getStateId());
|
|
||||||
|
|
||||||
if(stateInfo != null && nonNull(stateInfo.getSystems()).stream()
|
|
||||||
.anyMatch(system -> system.getSystemId() == systemId))
|
|
||||||
{
|
|
||||||
return new ViewTarget(getCountryId(service, state.getStateId()), state.getStateId(), 0,
|
|
||||||
Level.STATE, systemId, siteId, null, null);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
String key = request.getSourceKey();
|
|
||||||
AgencyFrequencyEditor.FrequencyTarget frequency = getFrequencyTarget(request.getCandidate());
|
|
||||||
|
|
||||||
if(key != null && key.startsWith("county:"))
|
|
||||||
{
|
|
||||||
int countyId = Integer.parseInt(key.substring("county:".length()));
|
|
||||||
CountyInfo countyInfo = service.getCountyInfo(countyId);
|
|
||||||
|
|
||||||
if(countyInfo != null)
|
|
||||||
{
|
|
||||||
return new ViewTarget(getCountryId(service, countyInfo.getStateId()), countyInfo.getStateId(),
|
|
||||||
countyId, Level.COUNTY, null, -1, -countyId, frequency);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if(key != null && key.startsWith("agency:"))
|
|
||||||
{
|
|
||||||
int agencyId = Integer.parseInt(key.substring("agency:".length()));
|
|
||||||
AgencyInfo agencyInfo = service.getAgencyInfo(agencyId);
|
|
||||||
|
|
||||||
if(agencyInfo != null && isCounty(agencyInfo.getCountyId()))
|
|
||||||
{
|
|
||||||
CountyInfo countyInfo = service.getCountyInfo(agencyInfo.getCountyId());
|
|
||||||
|
|
||||||
if(countyInfo != null && nonNull(countyInfo.getAgencies()).stream()
|
|
||||||
.anyMatch(agency -> agency.getAgencyId() == agencyId))
|
|
||||||
{
|
|
||||||
return new ViewTarget(getCountryId(service, countyInfo.getStateId()), countyInfo.getStateId(),
|
|
||||||
countyInfo.getCountyId(), Level.COUNTY, null, -1, agencyId, frequency);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(agencyInfo != null && agencyInfo.getStateId() > 0)
|
|
||||||
{
|
|
||||||
StateInfo stateInfo = service.getStateInfo(agencyInfo.getStateId());
|
|
||||||
|
|
||||||
if(stateInfo != null && nonNull(stateInfo.getAgencies()).stream()
|
|
||||||
.anyMatch(agency -> agency.getAgencyId() == agencyId))
|
|
||||||
{
|
|
||||||
return new ViewTarget(getCountryId(service, stateInfo.getStateId()), stateInfo.getStateId(), 0,
|
|
||||||
Level.STATE, null, -1, agencyId, frequency);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Frequency to select for the candidate: its source is the owner, category and subcategory
|
|
||||||
*/
|
|
||||||
private static AgencyFrequencyEditor.FrequencyTarget getFrequencyTarget(FrequencyCandidate candidate)
|
|
||||||
{
|
|
||||||
if(candidate == null)
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
String[] source = candidate.source() != null ? candidate.source().split(" › ") : new String[0];
|
|
||||||
String category = source.length >= 3 ? source[source.length - 2] : null;
|
|
||||||
String subCategory = source.length >= 3 ? source[source.length - 1] : null;
|
|
||||||
return new AgencyFrequencyEditor.FrequencyTarget(category, subCategory, candidate.frequencyHz(),
|
|
||||||
candidate.title(), candidate.alphaTag());
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Country of the state: the preferred country when it has the state, or else the first country that has it
|
|
||||||
*/
|
|
||||||
private int getCountryId(RadioReferenceService service, int stateId) throws RadioReferenceException
|
|
||||||
{
|
|
||||||
int preferredCountryId = mUserPreferences.getRadioReferencePreference().getPreferredCountryId();
|
|
||||||
List<Integer> countryIds = new ArrayList<>();
|
|
||||||
|
|
||||||
if(preferredCountryId > 0)
|
|
||||||
{
|
|
||||||
countryIds.add(preferredCountryId);
|
|
||||||
}
|
|
||||||
|
|
||||||
for(Country country: nonNull(service.getCountries()))
|
|
||||||
{
|
|
||||||
if(country.getCountryId() != preferredCountryId)
|
|
||||||
{
|
|
||||||
countryIds.add(country.getCountryId());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for(Integer countryId: countryIds)
|
|
||||||
{
|
|
||||||
CountryInfo countryInfo = service.getCountryInfo(countryId);
|
|
||||||
|
|
||||||
if(countryInfo != null && nonNull(countryInfo.getStates()).stream()
|
|
||||||
.anyMatch(state -> state.getStateId() == stateId))
|
|
||||||
{
|
|
||||||
return countryId;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return preferredCountryId;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Indicates if the county id is a real county. Temporary sites in an unknown county have county id 99999.
|
|
||||||
*/
|
|
||||||
private static boolean isCounty(int countyId)
|
|
||||||
{
|
|
||||||
return countyId > 0 && countyId != 99999;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static <T> List<T> nonNull(List<T> list)
|
|
||||||
{
|
|
||||||
return list != null ? list : List.of();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Selects the target's country, state and county, its tab, and its system or agency. Selecting a country, state
|
|
||||||
* or county loads the lists below it, which select the preferred ids set here, so only the first selection that
|
|
||||||
* changes is made here.
|
|
||||||
*/
|
|
||||||
private void navigate(ViewTarget target)
|
|
||||||
{
|
|
||||||
RadioReferencePreference preference = mUserPreferences.getRadioReferencePreference();
|
|
||||||
preference.setPreferredCountryId(target.countryId());
|
|
||||||
preference.setPreferredStateId(target.stateId());
|
|
||||||
|
|
||||||
if(target.countyId() > 0)
|
|
||||||
{
|
|
||||||
preference.setPreferredCountyId(target.countyId());
|
|
||||||
}
|
|
||||||
|
|
||||||
SystemEditor systemEditor = target.level() == Level.COUNTY ? getCountySystemEditor() : getStateSystemEditor();
|
|
||||||
AgencyEditor agencyEditor = target.level() == Level.COUNTY ? getCountyAgencyEditor() : getStateAgencyEditor();
|
|
||||||
|
|
||||||
if(target.systemId() != null)
|
|
||||||
{
|
|
||||||
systemEditor.prepareView(target.systemId(), target.siteId());
|
|
||||||
getTabPane().getSelectionModel().select(target.level() == Level.COUNTY ? getCountySystemTab() :
|
|
||||||
getStateSystemTab());
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
agencyEditor.prepareView(target.agencyId(), target.frequency());
|
|
||||||
getTabPane().getSelectionModel().select(target.level() == Level.COUNTY ? getCountyAgencyTab() :
|
|
||||||
getStateAgencyTab());
|
|
||||||
}
|
|
||||||
|
|
||||||
//Lists that are still loading select the preferred ids when they arrive
|
|
||||||
Country country = getCountryComboBox().getItems().stream()
|
|
||||||
.filter(item -> item.getCountryId() == target.countryId()).findFirst().orElse(null);
|
|
||||||
|
|
||||||
if(country == null)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(getCountryComboBox().getValue() != country)
|
|
||||||
{
|
|
||||||
getCountryComboBox().getSelectionModel().select(country);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
State state = getStateComboBox().getItems().stream()
|
|
||||||
.filter(item -> item.getStateId() == target.stateId()).findFirst().orElse(null);
|
|
||||||
|
|
||||||
if(state == null)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(getStateComboBox().getValue() != state)
|
|
||||||
{
|
|
||||||
getStateComboBox().getSelectionModel().select(state);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(target.level() == Level.COUNTY)
|
|
||||||
{
|
|
||||||
County county = getCountyComboBox().getItems().stream()
|
|
||||||
.filter(item -> item.getCountyId() == target.countyId()).findFirst().orElse(null);
|
|
||||||
|
|
||||||
if(county == null)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(getCountyComboBox().getValue() != county)
|
|
||||||
{
|
|
||||||
getCountyComboBox().getSelectionModel().select(county);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean listed = target.systemId() != null ? systemEditor.view(target.systemId(), target.siteId()) :
|
|
||||||
agencyEditor.view(target.agencyId(), target.frequency());
|
|
||||||
|
|
||||||
if(!listed)
|
|
||||||
{
|
|
||||||
showViewError("The Radio Reference tab doesn't list this " + (target.systemId() != null ? "system" :
|
|
||||||
"agency") + ".");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void showViewError(String message)
|
|
||||||
{
|
|
||||||
Alert alert = new Alert(Alert.AlertType.INFORMATION, message, ButtonType.OK);
|
|
||||||
alert.setTitle("Radio Reference");
|
|
||||||
alert.setHeaderText("Can't show the Radio Reference listing");
|
|
||||||
|
|
||||||
if(getScene() != null)
|
|
||||||
{
|
|
||||||
alert.initOwner(getScene().getWindow());
|
|
||||||
}
|
|
||||||
|
|
||||||
alert.show();
|
|
||||||
}
|
|
||||||
|
|
||||||
private TabPane getTabPane()
|
private TabPane getTabPane()
|
||||||
{
|
{
|
||||||
if(mTabPane == null)
|
if(mTabPane == null)
|
||||||
@@ -941,6 +596,8 @@ public class RadioReferenceEditor extends BorderPane implements Consumer<Authori
|
|||||||
|
|
||||||
if(country != null)
|
if(country != null)
|
||||||
{
|
{
|
||||||
|
int preferredStateId = mUserPreferences.getRadioReferencePreference().getPreferredStateId();
|
||||||
|
|
||||||
ThreadPool.CACHED.execute(() -> {
|
ThreadPool.CACHED.execute(() -> {
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@@ -949,7 +606,6 @@ public class RadioReferenceEditor extends BorderPane implements Consumer<Authori
|
|||||||
Platform.runLater(() -> {
|
Platform.runLater(() -> {
|
||||||
getNationalAgencyEditor().setAgencies(countryInfo.getAgencies());
|
getNationalAgencyEditor().setAgencies(countryInfo.getAgencies());
|
||||||
getStateComboBox().getItems().addAll(countryInfo.getStates());
|
getStateComboBox().getItems().addAll(countryInfo.getStates());
|
||||||
int preferredStateId = mUserPreferences.getRadioReferencePreference().getPreferredStateId();
|
|
||||||
|
|
||||||
for(State state: mStateComboBox.getItems())
|
for(State state: mStateComboBox.getItems())
|
||||||
{
|
{
|
||||||
@@ -996,6 +652,8 @@ public class RadioReferenceEditor extends BorderPane implements Consumer<Authori
|
|||||||
clearEditors(Level.STATE);
|
clearEditors(Level.STATE);
|
||||||
getCountyComboBox().getItems().clear();
|
getCountyComboBox().getItems().clear();
|
||||||
|
|
||||||
|
int preferredCountyId = mUserPreferences.getRadioReferencePreference().getPreferredCountyId();
|
||||||
|
|
||||||
if(state != null)
|
if(state != null)
|
||||||
{
|
{
|
||||||
ThreadPool.CACHED.execute(() -> {
|
ThreadPool.CACHED.execute(() -> {
|
||||||
@@ -1007,7 +665,6 @@ public class RadioReferenceEditor extends BorderPane implements Consumer<Authori
|
|||||||
getStateAgencyEditor().setAgencies(stateInfo.getAgencies());
|
getStateAgencyEditor().setAgencies(stateInfo.getAgencies());
|
||||||
getStateSystemEditor().setSystems(stateInfo.getSystems());
|
getStateSystemEditor().setSystems(stateInfo.getSystems());
|
||||||
getCountyComboBox().getItems().addAll(stateInfo.getCounties());
|
getCountyComboBox().getItems().addAll(stateInfo.getCounties());
|
||||||
int preferredCountyId = mUserPreferences.getRadioReferencePreference().getPreferredCountyId();
|
|
||||||
|
|
||||||
for(County county: mCountyComboBox.getItems())
|
for(County county: mCountyComboBox.getItems())
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory;
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Playlist actions for radio reference frequencies and trunked system sites: find the playlist channel that already
|
* Playlist actions for radio reference frequencies and trunked system sites: find the playlist channel that already
|
||||||
* decodes a frequency or site, enable or disable it, or add a channel and optionally start it. A frequency or site that already
|
* decodes a frequency or site, enable or disable it, or add a channel and start it. A frequency or site that already
|
||||||
* has a playlist channel with the same protocol isn't added again.
|
* has a playlist channel with the same protocol isn't added again.
|
||||||
*
|
*
|
||||||
* The add, enable and disable actions run in the background and report errors to the caller's error handler, on the
|
* The add, enable and disable actions run in the background and report errors to the caller's error handler, on the
|
||||||
@@ -452,17 +452,6 @@ public class RadioReferencePlaylistActions
|
|||||||
* @param firstFrequency to start the new control channel on, e.g. the frequency the user picked, or null
|
* @param firstFrequency to start the new control channel on, e.g. the frequency the user picked, or null
|
||||||
*/
|
*/
|
||||||
public void addSite(SiteRecord siteRecord, Long firstFrequency, Consumer<String> onError)
|
public void addSite(SiteRecord siteRecord, Long firstFrequency, Consumer<String> onError)
|
||||||
{
|
|
||||||
addSite(siteRecord, firstFrequency, true, onError);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Adds playlist channels for the trunked system site, like {@link #addSite(SiteRecord, Long, Consumer)}, and
|
|
||||||
* optionally starts them.
|
|
||||||
* @param firstFrequency to start the new control channel on, e.g. the frequency the user picked, or null
|
|
||||||
* @param start true to start the new channels, or the site's existing channels
|
|
||||||
*/
|
|
||||||
public void addSite(SiteRecord siteRecord, Long firstFrequency, boolean start, Consumer<String> onError)
|
|
||||||
{
|
{
|
||||||
ThreadPool.CACHED.execute(() -> {
|
ThreadPool.CACHED.execute(() -> {
|
||||||
SiteDetails details = getSiteDetails(siteRecord, onError);
|
SiteDetails details = getSiteDetails(siteRecord, onError);
|
||||||
@@ -486,22 +475,15 @@ public class RadioReferencePlaylistActions
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(start)
|
|
||||||
{
|
|
||||||
enableAll(existing, onError);
|
enableAll(existing, onError);
|
||||||
}
|
|
||||||
|
|
||||||
//The channel model's list backs the playlist editor, so it's changed on the JavaFX thread
|
//The channel model's list backs the playlist editor, so it's changed on the JavaFX thread
|
||||||
Platform.runLater(() -> {
|
Platform.runLater(() -> {
|
||||||
for(Channel channel: channels)
|
for(Channel channel: channels)
|
||||||
{
|
{
|
||||||
mPlaylistManager.getChannelModel().addChannel(channel);
|
mPlaylistManager.getChannelModel().addChannel(channel);
|
||||||
|
|
||||||
if(start)
|
|
||||||
{
|
|
||||||
enable(channel, onError);
|
enable(channel, onError);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -517,7 +499,7 @@ public class RadioReferencePlaylistActions
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
add(channel, start, onError);
|
addAndStart(channel, onError);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -525,16 +507,6 @@ public class RadioReferencePlaylistActions
|
|||||||
* Adds a playlist channel for one repeater of a repeater site (LTR) and starts it, or starts its existing channel
|
* Adds a playlist channel for one repeater of a repeater site (LTR) and starts it, or starts its existing channel
|
||||||
*/
|
*/
|
||||||
public void addRepeater(SiteRecord siteRecord, long frequency, Consumer<String> onError)
|
public void addRepeater(SiteRecord siteRecord, long frequency, Consumer<String> onError)
|
||||||
{
|
|
||||||
addRepeater(siteRecord, frequency, true, onError);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Adds a playlist channel for one repeater of a repeater site (LTR) unless the playlist has one, and optionally
|
|
||||||
* starts the channel
|
|
||||||
* @param start true to start the new or existing channel
|
|
||||||
*/
|
|
||||||
public void addRepeater(SiteRecord siteRecord, long frequency, boolean start, Consumer<String> onError)
|
|
||||||
{
|
{
|
||||||
ThreadPool.CACHED.execute(() -> {
|
ThreadPool.CACHED.execute(() -> {
|
||||||
SiteDetails details = getSiteDetails(siteRecord, onError);
|
SiteDetails details = getSiteDetails(siteRecord, onError);
|
||||||
@@ -554,7 +526,7 @@ public class RadioReferencePlaylistActions
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
add(channels.get(0), start, onError);
|
addAndStart(channels.get(0), onError);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -562,16 +534,6 @@ public class RadioReferencePlaylistActions
|
|||||||
* Adds a playlist channel for the conventional frequency and starts it, or starts the existing channel
|
* Adds a playlist channel for the conventional frequency and starts it, or starts the existing channel
|
||||||
*/
|
*/
|
||||||
public void addConventional(FrequencyCandidate candidate, Consumer<String> onError)
|
public void addConventional(FrequencyCandidate candidate, Consumer<String> onError)
|
||||||
{
|
|
||||||
addConventional(candidate, true, onError);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Adds a playlist channel for the conventional frequency unless the playlist has one, and optionally starts the
|
|
||||||
* channel
|
|
||||||
* @param start true to start the new or existing channel
|
|
||||||
*/
|
|
||||||
public void addConventional(FrequencyCandidate candidate, boolean start, Consumer<String> onError)
|
|
||||||
{
|
{
|
||||||
ModeDecoderType mode = ModeDecoderType.fromName(candidate.mode());
|
ModeDecoderType mode = ModeDecoderType.fromName(candidate.mode());
|
||||||
String[] source = candidate.source() != null ? candidate.source().split(" › ") : new String[0];
|
String[] source = candidate.source() != null ? candidate.source().split(" › ") : new String[0];
|
||||||
@@ -588,36 +550,28 @@ public class RadioReferencePlaylistActions
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
add(channel, start, onError);
|
addAndStart(channel, onError);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Adds the channel to the playlist and optionally starts it, unless the playlist already has a channel for its
|
* Adds the channel to the playlist and starts it, unless the playlist already has a channel for its frequencies
|
||||||
* frequencies and protocol, which is started instead when starting
|
* and protocol, which is started instead
|
||||||
*/
|
*/
|
||||||
private void add(Channel channel, boolean start, Consumer<String> onError)
|
private void addAndStart(Channel channel, Consumer<String> onError)
|
||||||
{
|
{
|
||||||
Channel existing = findChannel(getFrequencies(channel.getSourceConfiguration()),
|
Channel existing = findChannel(getFrequencies(channel.getSourceConfiguration()),
|
||||||
getProtocolFamily(channel.getDecodeConfiguration().getDecoderType()));
|
getProtocolFamily(channel.getDecodeConfiguration().getDecoderType()));
|
||||||
|
|
||||||
if(existing != null)
|
if(existing != null)
|
||||||
{
|
|
||||||
if(start)
|
|
||||||
{
|
{
|
||||||
enable(existing, onError);
|
enable(existing, onError);
|
||||||
}
|
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
//The channel model's list backs the playlist editor, so it's changed on the JavaFX thread
|
//The channel model's list backs the playlist editor, so it's changed on the JavaFX thread
|
||||||
Platform.runLater(() -> {
|
Platform.runLater(() -> {
|
||||||
mPlaylistManager.getChannelModel().addChannel(channel);
|
mPlaylistManager.getChannelModel().addChannel(channel);
|
||||||
|
|
||||||
if(start)
|
|
||||||
{
|
|
||||||
enable(channel, onError);
|
enable(channel, onError);
|
||||||
}
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -19,7 +19,6 @@
|
|||||||
|
|
||||||
package io.github.dsheirer.gui.playlist.radioreference;
|
package io.github.dsheirer.gui.playlist.radioreference;
|
||||||
|
|
||||||
import io.github.dsheirer.alias.AliasListConfiguration;
|
|
||||||
import io.github.dsheirer.alias.AliasModel;
|
import io.github.dsheirer.alias.AliasModel;
|
||||||
import io.github.dsheirer.controller.channel.Channel;
|
import io.github.dsheirer.controller.channel.Channel;
|
||||||
import io.github.dsheirer.eventbus.MyEventBus;
|
import io.github.dsheirer.eventbus.MyEventBus;
|
||||||
@@ -46,7 +45,6 @@ import io.github.dsheirer.rrapi.type.Site;
|
|||||||
import io.github.dsheirer.rrapi.type.SiteFrequency;
|
import io.github.dsheirer.rrapi.type.SiteFrequency;
|
||||||
import io.github.dsheirer.rrapi.type.System;
|
import io.github.dsheirer.rrapi.type.System;
|
||||||
import io.github.dsheirer.rrapi.type.SystemInformation;
|
import io.github.dsheirer.rrapi.type.SystemInformation;
|
||||||
import io.github.dsheirer.service.radioreference.AliasListSynchronizer;
|
|
||||||
import io.github.dsheirer.source.config.SourceConfigTuner;
|
import io.github.dsheirer.source.config.SourceConfigTuner;
|
||||||
import io.github.dsheirer.source.config.SourceConfigTunerMultipleFrequency;
|
import io.github.dsheirer.source.config.SourceConfigTunerMultipleFrequency;
|
||||||
import java.text.DecimalFormat;
|
import java.text.DecimalFormat;
|
||||||
@@ -57,7 +55,6 @@ import java.util.List;
|
|||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import java.util.function.Predicate;
|
import java.util.function.Predicate;
|
||||||
import javafx.animation.RotateTransition;
|
import javafx.animation.RotateTransition;
|
||||||
import javafx.application.Platform;
|
|
||||||
import javafx.beans.property.ReadOnlyObjectWrapper;
|
import javafx.beans.property.ReadOnlyObjectWrapper;
|
||||||
import javafx.beans.property.SimpleStringProperty;
|
import javafx.beans.property.SimpleStringProperty;
|
||||||
import javafx.beans.value.ObservableValue;
|
import javafx.beans.value.ObservableValue;
|
||||||
@@ -78,7 +75,6 @@ import javafx.scene.control.TextField;
|
|||||||
import javafx.scene.control.TextFormatter;
|
import javafx.scene.control.TextFormatter;
|
||||||
import javafx.scene.control.TextInputDialog;
|
import javafx.scene.control.TextInputDialog;
|
||||||
import javafx.scene.control.ToggleButton;
|
import javafx.scene.control.ToggleButton;
|
||||||
import javafx.scene.control.Tooltip;
|
|
||||||
import javafx.scene.control.cell.PropertyValueFactory;
|
import javafx.scene.control.cell.PropertyValueFactory;
|
||||||
import javafx.scene.layout.ColumnConstraints;
|
import javafx.scene.layout.ColumnConstraints;
|
||||||
import javafx.scene.layout.GridPane;
|
import javafx.scene.layout.GridPane;
|
||||||
@@ -124,7 +120,6 @@ public class SiteEditor extends GridPane
|
|||||||
private SystemInformation mCurrentSystemInformation;
|
private SystemInformation mCurrentSystemInformation;
|
||||||
private ComboBox mAliasListNameComboBox;
|
private ComboBox mAliasListNameComboBox;
|
||||||
private Button mNewAliasListButton;
|
private Button mNewAliasListButton;
|
||||||
private Button mNewSystemAliasListButton;
|
|
||||||
private Label mP25ControlLabel;
|
private Label mP25ControlLabel;
|
||||||
private SegmentedButton mP25ControlSegmentedButton;
|
private SegmentedButton mP25ControlSegmentedButton;
|
||||||
private ToggleButton mFdmaControlToggleButton;
|
private ToggleButton mFdmaControlToggleButton;
|
||||||
@@ -227,12 +222,8 @@ public class SiteEditor extends GridPane
|
|||||||
GridPane.setHgrow(getAliasListNameComboBox(), Priority.ALWAYS);
|
GridPane.setHgrow(getAliasListNameComboBox(), Priority.ALWAYS);
|
||||||
getChildren().add(getAliasListNameComboBox());
|
getChildren().add(getAliasListNameComboBox());
|
||||||
|
|
||||||
HBox aliasListButtonsBox = new HBox();
|
GridPane.setConstraints(getNewAliasListButton(), 2, ++row);
|
||||||
aliasListButtonsBox.setAlignment(Pos.CENTER_LEFT);
|
getChildren().add(getNewAliasListButton());
|
||||||
aliasListButtonsBox.setSpacing(10);
|
|
||||||
aliasListButtonsBox.getChildren().addAll(getNewAliasListButton(), getNewSystemAliasListButton());
|
|
||||||
GridPane.setConstraints(aliasListButtonsBox, 2, ++row);
|
|
||||||
getChildren().add(aliasListButtonsBox);
|
|
||||||
|
|
||||||
HBox createBox = new HBox();
|
HBox createBox = new HBox();
|
||||||
createBox.setAlignment(Pos.CENTER_LEFT);
|
createBox.setAlignment(Pos.CENTER_LEFT);
|
||||||
@@ -287,18 +278,6 @@ public class SiteEditor extends GridPane
|
|||||||
getGoToChannelEditorCheckBox().setDisable(disable || !supported);
|
getGoToChannelEditorCheckBox().setDisable(disable || !supported);
|
||||||
getAliasListNameComboBox().setDisable(disable || !supported);
|
getAliasListNameComboBox().setDisable(disable || !supported);
|
||||||
getNewAliasListButton().setDisable(disable || !supported);
|
getNewAliasListButton().setDisable(disable || !supported);
|
||||||
getNewSystemAliasListButton().setDisable(disable || !supported || system == null);
|
|
||||||
|
|
||||||
//Select an alias list that tracks this site's system, if there is one
|
|
||||||
if(system != null)
|
|
||||||
{
|
|
||||||
String trackingAliasList = mPlaylistManager.getAliasModel().getAliasListNameTracking(system.getSystemId());
|
|
||||||
|
|
||||||
if(trackingAliasList != null)
|
|
||||||
{
|
|
||||||
getAliasListNameComboBox().getSelectionModel().select(trackingAliasList);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
getCreateChannelConfigurationButton().setVisible(false);
|
getCreateChannelConfigurationButton().setVisible(false);
|
||||||
getGoToChannelEditorCheckBox().setVisible(false);
|
getGoToChannelEditorCheckBox().setVisible(false);
|
||||||
@@ -899,97 +878,6 @@ public class SiteEditor extends GridPane
|
|||||||
return mNewAliasListButton;
|
return mNewAliasListButton;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Button to create an alias list that tracks the talkgroups of the current system on Radio Reference.
|
|
||||||
*/
|
|
||||||
private Button getNewSystemAliasListButton()
|
|
||||||
{
|
|
||||||
if(mNewSystemAliasListButton == null)
|
|
||||||
{
|
|
||||||
mNewSystemAliasListButton = new Button("New Alias List For System");
|
|
||||||
mNewSystemAliasListButton.setTooltip(new Tooltip("Create an alias list with the system's talkgroups " +
|
|
||||||
"that tracks the system on Radio Reference and automatically adds or updates talkgroup aliases"));
|
|
||||||
mNewSystemAliasListButton.setDisable(true);
|
|
||||||
mNewSystemAliasListButton.setOnAction(event -> createSystemAliasList());
|
|
||||||
}
|
|
||||||
|
|
||||||
return mNewSystemAliasListButton;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Prompts for a name and creates an alias list that tracks the current system, then imports the talkgroups.
|
|
||||||
*/
|
|
||||||
private void createSystemAliasList()
|
|
||||||
{
|
|
||||||
if(mCurrentSystem == null)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
String systemName = mCurrentSystem.getName() != null ? mCurrentSystem.getName().trim() : "";
|
|
||||||
|
|
||||||
if(systemName.length() > 25)
|
|
||||||
{
|
|
||||||
systemName = systemName.substring(0, 25).trim();
|
|
||||||
}
|
|
||||||
|
|
||||||
TextInputDialog dialog = new TextInputDialog(systemName);
|
|
||||||
dialog.setTitle("Create New Alias List For System");
|
|
||||||
dialog.setHeaderText("Create an alias list that tracks the talkgroups for " + mCurrentSystem.getName() +
|
|
||||||
".\nPlease enter an alias list name (max 25 chars).");
|
|
||||||
dialog.setContentText("Name:");
|
|
||||||
dialog.getEditor().setTextFormatter(new TextFormatter<String>(new MaxLengthUnaryOperator(25)));
|
|
||||||
dialog.initOwner(getNewSystemAliasListButton().getScene().getWindow());
|
|
||||||
Optional<String> result = dialog.showAndWait();
|
|
||||||
|
|
||||||
if(result.isEmpty() || result.get().trim().isEmpty())
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
String name = result.get().trim();
|
|
||||||
AliasModel aliasModel = mPlaylistManager.getAliasModel();
|
|
||||||
|
|
||||||
if(name.equals(AliasModel.NO_ALIAS_LIST) || aliasModel.aliasListNames().contains(name))
|
|
||||||
{
|
|
||||||
Alert alert = new Alert(Alert.AlertType.ERROR, "An alias list named [" + name +
|
|
||||||
"] already exists. Please choose another name.", ButtonType.OK);
|
|
||||||
alert.setTitle("Create New Alias List For System");
|
|
||||||
alert.setHeaderText("Alias List Exists");
|
|
||||||
alert.initOwner(getNewSystemAliasListButton().getScene().getWindow());
|
|
||||||
alert.showAndWait();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
AliasListConfiguration configuration = aliasModel.getOrCreateAliasListConfiguration(name);
|
|
||||||
configuration.track(mCurrentSystem.getSystemId(), mCurrentSystem.getName());
|
|
||||||
configuration.setAutoUpdate(true);
|
|
||||||
getAliasListNameComboBox().getSelectionModel().select(name);
|
|
||||||
|
|
||||||
getNewSystemAliasListButton().setDisable(true);
|
|
||||||
|
|
||||||
mPlaylistManager.getAliasListSynchronizer().refresh(configuration)
|
|
||||||
.whenComplete((syncResult, throwable) -> Platform.runLater(() -> {
|
|
||||||
getNewSystemAliasListButton().setDisable(mCurrentSystem == null);
|
|
||||||
|
|
||||||
if(throwable != null)
|
|
||||||
{
|
|
||||||
Alert alert = new Alert(Alert.AlertType.ERROR, "Alias list [" + name + "] was created, but the " +
|
|
||||||
"talkgroups couldn't be imported from Radio Reference. Use Refresh Now in the Aliases tab " +
|
|
||||||
"to try again.\n\n" + AliasListSynchronizer.getMessage(throwable), ButtonType.OK);
|
|
||||||
alert.setTitle("Create New Alias List For System");
|
|
||||||
alert.setHeaderText("Talkgroup Import Failed");
|
|
||||||
|
|
||||||
if(getScene() != null)
|
|
||||||
{
|
|
||||||
alert.initOwner(getScene().getWindow());
|
|
||||||
}
|
|
||||||
|
|
||||||
alert.show();
|
|
||||||
}
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
|
|
||||||
private Label getProtocolNotSupportedLabel()
|
private Label getProtocolNotSupportedLabel()
|
||||||
{
|
{
|
||||||
if(mProtocolNotSupportedLabel == null)
|
if(mProtocolNotSupportedLabel == null)
|
||||||
|
|||||||
@@ -156,41 +156,6 @@ public class SystemEditor extends VBox
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Prepares to show the system with the site selected when the systems are next set.
|
|
||||||
* @param systemId of the system
|
|
||||||
* @param siteId to select, or -1 for none
|
|
||||||
*/
|
|
||||||
public void prepareView(int systemId, int siteId)
|
|
||||||
{
|
|
||||||
mUserPreferences.getRadioReferencePreference().setPreferredSystemId(systemId, mLevel);
|
|
||||||
getTabPane().getSelectionModel().select(getSystemTab());
|
|
||||||
getSystemSiteSelectionEditor().viewSite(systemId, siteId);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Shows the system with the site selected
|
|
||||||
* @param systemId of the system
|
|
||||||
* @param siteId to select, or -1 for none
|
|
||||||
* @return false when the editor doesn't list the system
|
|
||||||
*/
|
|
||||||
public boolean view(int systemId, int siteId)
|
|
||||||
{
|
|
||||||
prepareView(systemId, siteId);
|
|
||||||
|
|
||||||
for(System system: getSystemComboBox().getItems())
|
|
||||||
{
|
|
||||||
if(system.getSystemId() == systemId)
|
|
||||||
{
|
|
||||||
//Selecting the shown system again doesn't reload it - the site is selected in the shown system
|
|
||||||
getSystemComboBox().getSelectionModel().select(system);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return getSystemComboBox().getItems().isEmpty();
|
|
||||||
}
|
|
||||||
|
|
||||||
private TabPane getTabPane()
|
private TabPane getTabPane()
|
||||||
{
|
{
|
||||||
if(mTabPane == null)
|
if(mTabPane == null)
|
||||||
|
|||||||
@@ -58,8 +58,6 @@ public class SystemSiteSelectionEditor extends GridPane
|
|||||||
private UserPreferences mUserPreferences;
|
private UserPreferences mUserPreferences;
|
||||||
private PlaylistManager mPlaylistManager;
|
private PlaylistManager mPlaylistManager;
|
||||||
private ProgressIndicator mProgressIndicator;
|
private ProgressIndicator mProgressIndicator;
|
||||||
private int mPendingSystemId = -1;
|
|
||||||
private int mPendingSiteId = -1;
|
|
||||||
private Label mPlaceholderLabel;
|
private Label mPlaceholderLabel;
|
||||||
private Label mProtocolLabel;
|
private Label mProtocolLabel;
|
||||||
private Label mFlavorLabel;
|
private Label mFlavorLabel;
|
||||||
@@ -134,46 +132,6 @@ public class SystemSiteSelectionEditor extends GridPane
|
|||||||
Collections.sort(sites, Ordering.natural());
|
Collections.sort(sites, Ordering.natural());
|
||||||
getSiteTableView().getItems().addAll(sites);
|
getSiteTableView().getItems().addAll(sites);
|
||||||
setLoading(false);
|
setLoading(false);
|
||||||
|
|
||||||
if(system != null && system.getSystemId() == mPendingSystemId)
|
|
||||||
{
|
|
||||||
selectSite(mPendingSiteId);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Selects the site once the system is shown, or now when it's already shown.
|
|
||||||
* @param systemId of the system
|
|
||||||
* @param siteId to select, or -1 for none
|
|
||||||
*/
|
|
||||||
public void viewSite(int systemId, int siteId)
|
|
||||||
{
|
|
||||||
if(mCurrentSystem != null && mCurrentSystem.getSystemId() == systemId &&
|
|
||||||
!getSiteTableView().getItems().isEmpty())
|
|
||||||
{
|
|
||||||
selectSite(siteId);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
mPendingSystemId = systemId;
|
|
||||||
mPendingSiteId = siteId;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void selectSite(int siteId)
|
|
||||||
{
|
|
||||||
mPendingSystemId = -1;
|
|
||||||
mPendingSiteId = -1;
|
|
||||||
|
|
||||||
for(EnrichedSite site: getSiteTableView().getItems())
|
|
||||||
{
|
|
||||||
if(site.getSite() != null && site.getSite().getSiteId() == siteId)
|
|
||||||
{
|
|
||||||
getSiteTableView().getSelectionModel().select(site);
|
|
||||||
getSiteTableView().scrollTo(site);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void clear()
|
public void clear()
|
||||||
|
|||||||
@@ -1,100 +0,0 @@
|
|||||||
/*
|
|
||||||
* *****************************************************************************
|
|
||||||
* Copyright (C) 2014-2026 Dennis Sheirer
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
|
||||||
* ****************************************************************************
|
|
||||||
*/
|
|
||||||
|
|
||||||
package io.github.dsheirer.gui.playlist.radioreference;
|
|
||||||
|
|
||||||
import io.github.dsheirer.gui.playlist.PlaylistEditorRequest;
|
|
||||||
import io.github.dsheirer.service.radioreference.FrequencyCandidate;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Request to show a trunked system site, or a conventional frequency, in the playlist editor's Radio Reference tab
|
|
||||||
*/
|
|
||||||
public class ViewRadioReferenceRequest extends PlaylistEditorRequest
|
|
||||||
{
|
|
||||||
private final Integer mSystemId;
|
|
||||||
private final Integer mSiteId;
|
|
||||||
private final String mSourceKey;
|
|
||||||
private final FrequencyCandidate mCandidate;
|
|
||||||
|
|
||||||
private ViewRadioReferenceRequest(Integer systemId, Integer siteId, String sourceKey, FrequencyCandidate candidate)
|
|
||||||
{
|
|
||||||
mSystemId = systemId;
|
|
||||||
mSiteId = siteId;
|
|
||||||
mSourceKey = sourceKey;
|
|
||||||
mCandidate = candidate;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Request to show a trunked system with the site selected
|
|
||||||
* @param systemId radio reference system id
|
|
||||||
* @param siteId radio reference site id, or null to show the system only
|
|
||||||
*/
|
|
||||||
public static ViewRadioReferenceRequest site(int systemId, Integer siteId)
|
|
||||||
{
|
|
||||||
return new ViewRadioReferenceRequest(systemId, siteId, null, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Request to show a conventional frequency in the county or agency that lists it
|
|
||||||
* @param sourceKey of the county or agency that lists the frequency: county:123 or agency:789
|
|
||||||
* @param candidate frequency to select
|
|
||||||
*/
|
|
||||||
public static ViewRadioReferenceRequest frequency(String sourceKey, FrequencyCandidate candidate)
|
|
||||||
{
|
|
||||||
return new ViewRadioReferenceRequest(null, null, sourceKey, candidate);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Radio reference system id, or null for a conventional frequency
|
|
||||||
*/
|
|
||||||
public Integer getSystemId()
|
|
||||||
{
|
|
||||||
return mSystemId;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Radio reference site id, or null
|
|
||||||
*/
|
|
||||||
public Integer getSiteId()
|
|
||||||
{
|
|
||||||
return mSiteId;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Key of the county or agency that lists the conventional frequency, or null for a trunked system
|
|
||||||
*/
|
|
||||||
public String getSourceKey()
|
|
||||||
{
|
|
||||||
return mSourceKey;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Conventional frequency to select, or null for a trunked system
|
|
||||||
*/
|
|
||||||
public FrequencyCandidate getCandidate()
|
|
||||||
{
|
|
||||||
return mCandidate;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public TabName getTabName()
|
|
||||||
{
|
|
||||||
return TabName.RADIOREFERENCE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -27,7 +27,6 @@ import io.github.dsheirer.gui.preference.decoder.JmbeLibraryPreferenceEditor;
|
|||||||
import io.github.dsheirer.gui.preference.directory.DirectoryPreferenceEditor;
|
import io.github.dsheirer.gui.preference.directory.DirectoryPreferenceEditor;
|
||||||
import io.github.dsheirer.gui.preference.mp3.MP3PreferenceEditor;
|
import io.github.dsheirer.gui.preference.mp3.MP3PreferenceEditor;
|
||||||
import io.github.dsheirer.gui.preference.playback.PlaybackPreferenceEditor;
|
import io.github.dsheirer.gui.preference.playback.PlaybackPreferenceEditor;
|
||||||
import io.github.dsheirer.gui.preference.radioreference.RadioReferencePreferenceEditor;
|
|
||||||
import io.github.dsheirer.gui.preference.record.RecordPreferenceEditor;
|
import io.github.dsheirer.gui.preference.record.RecordPreferenceEditor;
|
||||||
import io.github.dsheirer.gui.preference.tuner.TunerPreferenceEditor;
|
import io.github.dsheirer.gui.preference.tuner.TunerPreferenceEditor;
|
||||||
import io.github.dsheirer.preference.UserPreferences;
|
import io.github.dsheirer.preference.UserPreferences;
|
||||||
@@ -60,8 +59,6 @@ public class PreferenceEditorFactory
|
|||||||
return new DirectoryPreferenceEditor(userPreferences);
|
return new DirectoryPreferenceEditor(userPreferences);
|
||||||
case JMBE_LIBRARY:
|
case JMBE_LIBRARY:
|
||||||
return new JmbeLibraryPreferenceEditor(userPreferences);
|
return new JmbeLibraryPreferenceEditor(userPreferences);
|
||||||
case RADIO_REFERENCE_ALIAS_LISTS:
|
|
||||||
return new RadioReferencePreferenceEditor(userPreferences);
|
|
||||||
case SOURCE_TUNERS:
|
case SOURCE_TUNERS:
|
||||||
return new TunerPreferenceEditor(userPreferences);
|
return new TunerPreferenceEditor(userPreferences);
|
||||||
case TALKGROUP_FORMAT:
|
case TALKGROUP_FORMAT:
|
||||||
|
|||||||
@@ -29,7 +29,6 @@ public enum PreferenceEditorType
|
|||||||
CHANNEL_EVENT("Channel Events"),
|
CHANNEL_EVENT("Channel Events"),
|
||||||
DIRECTORY("Directories"),
|
DIRECTORY("Directories"),
|
||||||
JMBE_LIBRARY("JMBE Audio Library"),
|
JMBE_LIBRARY("JMBE Audio Library"),
|
||||||
RADIO_REFERENCE_ALIAS_LISTS("Alias Lists"),
|
|
||||||
AUDIO_MP3("MP3"),
|
AUDIO_MP3("MP3"),
|
||||||
AUDIO_RECORD("Record"),
|
AUDIO_RECORD("Record"),
|
||||||
AUDIO_OUTPUT("Playback/Tones"),
|
AUDIO_OUTPUT("Playback/Tones"),
|
||||||
|
|||||||
@@ -200,11 +200,6 @@ public class UserPreferencesEditor extends BorderPane
|
|||||||
treeRoot.getChildren().add(storageItem);
|
treeRoot.getChildren().add(storageItem);
|
||||||
storageItem.setExpanded(true);
|
storageItem.setExpanded(true);
|
||||||
|
|
||||||
TreeItem<String> radioReferenceItem = new TreeItem<>("Radio Reference");
|
|
||||||
radioReferenceItem.getChildren().add(new TreeItem(PreferenceEditorType.RADIO_REFERENCE_ALIAS_LISTS));
|
|
||||||
treeRoot.getChildren().add(radioReferenceItem);
|
|
||||||
radioReferenceItem.setExpanded(true);
|
|
||||||
|
|
||||||
TreeItem<String> sourceItem = new TreeItem<>("Source");
|
TreeItem<String> sourceItem = new TreeItem<>("Source");
|
||||||
sourceItem.getChildren().add(new TreeItem(PreferenceEditorType.SOURCE_TUNERS));
|
sourceItem.getChildren().add(new TreeItem(PreferenceEditorType.SOURCE_TUNERS));
|
||||||
treeRoot.getChildren().add(sourceItem);
|
treeRoot.getChildren().add(sourceItem);
|
||||||
|
|||||||
@@ -1,80 +0,0 @@
|
|||||||
/*
|
|
||||||
* *****************************************************************************
|
|
||||||
* Copyright (C) 2014-2026 Dennis Sheirer
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
|
||||||
* ****************************************************************************
|
|
||||||
*/
|
|
||||||
|
|
||||||
package io.github.dsheirer.gui.preference.radioreference;
|
|
||||||
|
|
||||||
import io.github.dsheirer.preference.UserPreferences;
|
|
||||||
import io.github.dsheirer.preference.radioreference.AliasListUpdateInterval;
|
|
||||||
import io.github.dsheirer.preference.radioreference.RadioReferencePreference;
|
|
||||||
import javafx.geometry.HPos;
|
|
||||||
import javafx.geometry.Insets;
|
|
||||||
import javafx.scene.control.ComboBox;
|
|
||||||
import javafx.scene.control.Label;
|
|
||||||
import javafx.scene.layout.GridPane;
|
|
||||||
import javafx.scene.layout.VBox;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Preference settings for alias lists that track a Radio Reference system.
|
|
||||||
*/
|
|
||||||
public class RadioReferencePreferenceEditor extends VBox
|
|
||||||
{
|
|
||||||
private RadioReferencePreference mRadioReferencePreference;
|
|
||||||
private ComboBox<AliasListUpdateInterval> mUpdateIntervalComboBox;
|
|
||||||
|
|
||||||
public RadioReferencePreferenceEditor(UserPreferences userPreferences)
|
|
||||||
{
|
|
||||||
mRadioReferencePreference = userPreferences.getRadioReferencePreference();
|
|
||||||
|
|
||||||
setPadding(new Insets(10, 10, 10, 10));
|
|
||||||
setSpacing(10);
|
|
||||||
|
|
||||||
GridPane gridPane = new GridPane();
|
|
||||||
gridPane.setHgap(10);
|
|
||||||
gridPane.setVgap(10);
|
|
||||||
|
|
||||||
Label intervalLabel = new Label("Check Tracked Systems For Talkgroup Changes:");
|
|
||||||
intervalLabel.setLabelFor(getUpdateIntervalComboBox());
|
|
||||||
GridPane.setHalignment(intervalLabel, HPos.RIGHT);
|
|
||||||
gridPane.add(intervalLabel, 0, 0);
|
|
||||||
gridPane.add(getUpdateIntervalComboBox(), 1, 0);
|
|
||||||
|
|
||||||
Label help = new Label("Alias lists that track a Radio Reference system check the system on this schedule " +
|
|
||||||
"while sdrtrunk is running and a Radio Reference login is stored. Alias lists with Auto-Update enabled " +
|
|
||||||
"add or update talkgroup aliases when the system changed. Use Refresh Now in the playlist editor's " +
|
|
||||||
"Aliases tab to update an alias list immediately.");
|
|
||||||
help.setWrapText(true);
|
|
||||||
help.setMaxWidth(500);
|
|
||||||
|
|
||||||
getChildren().addAll(gridPane, help);
|
|
||||||
}
|
|
||||||
|
|
||||||
private ComboBox<AliasListUpdateInterval> getUpdateIntervalComboBox()
|
|
||||||
{
|
|
||||||
if(mUpdateIntervalComboBox == null)
|
|
||||||
{
|
|
||||||
mUpdateIntervalComboBox = new ComboBox<>();
|
|
||||||
mUpdateIntervalComboBox.getItems().addAll(AliasListUpdateInterval.values());
|
|
||||||
mUpdateIntervalComboBox.getSelectionModel().select(mRadioReferencePreference.getAliasListUpdateInterval());
|
|
||||||
mUpdateIntervalComboBox.setOnAction(event -> mRadioReferencePreference
|
|
||||||
.setAliasListUpdateInterval(mUpdateIntervalComboBox.getSelectionModel().getSelectedItem()));
|
|
||||||
}
|
|
||||||
|
|
||||||
return mUpdateIntervalComboBox;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
/*
|
|
||||||
* *****************************************************************************
|
|
||||||
* Copyright (C) 2014-2026 Dennis Sheirer
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
|
||||||
* ****************************************************************************
|
|
||||||
*/
|
|
||||||
|
|
||||||
package io.github.dsheirer.gui.spectrum;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Channel shown in the display's Channels hover card
|
|
||||||
* @param title of the channel, drawn in the color of its state
|
|
||||||
* @param details lines
|
|
||||||
* @param state of the channel: an enabled or disabled playlist channel, or a radio reference candidate
|
|
||||||
* @param key identifying the channel, e.g. the playlist channel, so the card lists it once, or null
|
|
||||||
* @param prompts true when the entry is reason to show the card, e.g. the channel's labels don't fit in its box, or
|
|
||||||
* false when it's only listed while the card is shown for other entries
|
|
||||||
*/
|
|
||||||
public record ChannelCardEntry(String title, List<String> details, ChannelMenus.State state, Object key,
|
|
||||||
boolean prompts)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
@@ -1,399 +0,0 @@
|
|||||||
/*
|
|
||||||
* *****************************************************************************
|
|
||||||
* Copyright (C) 2014-2026 Dennis Sheirer
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
|
||||||
* ****************************************************************************
|
|
||||||
*/
|
|
||||||
|
|
||||||
package io.github.dsheirer.gui.spectrum;
|
|
||||||
|
|
||||||
import io.github.dsheirer.controller.channel.Channel;
|
|
||||||
import io.github.dsheirer.eventbus.MyEventBus;
|
|
||||||
import io.github.dsheirer.gui.playlist.channel.ViewChannelRequest;
|
|
||||||
import io.github.dsheirer.source.tuner.channel.TunerChannel;
|
|
||||||
import java.nio.charset.StandardCharsets;
|
|
||||||
import java.text.DecimalFormat;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Base64;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Locale;
|
|
||||||
import javafx.event.Event;
|
|
||||||
import javafx.event.EventHandler;
|
|
||||||
import javafx.scene.Node;
|
|
||||||
import javafx.scene.Scene;
|
|
||||||
import javafx.scene.control.ContextMenu;
|
|
||||||
import javafx.scene.control.Label;
|
|
||||||
import javafx.scene.control.Menu;
|
|
||||||
import javafx.scene.control.MenuItem;
|
|
||||||
import javafx.scene.control.SeparatorMenuItem;
|
|
||||||
import javafx.scene.layout.VBox;
|
|
||||||
import javafx.scene.paint.Color;
|
|
||||||
import javafx.stage.WindowEvent;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Context menu entries of the Channels section, shared by the playlist channel and radio reference layers. Each
|
|
||||||
* channel is a submenu showing its title and details, like the display's hover cards, with the actions for its state.
|
|
||||||
* The entries have the display theme's colors: the card background, with the title colored by state - the theme's
|
|
||||||
* active color (a green) for an enabled playlist channel, its inactive color (a blue) for a disabled one, and its
|
|
||||||
* plain text color for a radio reference candidate that isn't in the playlist.
|
|
||||||
*/
|
|
||||||
public final class ChannelMenus
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Context menu section of the channel entries
|
|
||||||
*/
|
|
||||||
public static final String SECTION = "Channels";
|
|
||||||
|
|
||||||
private static final DecimalFormat FREQUENCY_FORMAT = new DecimalFormat("0.00000");
|
|
||||||
private static final String STYLE_ITEM = "channel-menu-item";
|
|
||||||
private static final String STYLE_TITLE = "channel-menu-title";
|
|
||||||
private static final String STYLE_DETAIL = "channel-menu-detail";
|
|
||||||
private static final String STYLE_NOTE = "channel-menu-note";
|
|
||||||
//Minimum contrast ratio of the colored text against the menu background
|
|
||||||
private static final double MIN_CONTRAST = 3.0;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* State of a channel entry, which sets its color
|
|
||||||
*/
|
|
||||||
public enum State
|
|
||||||
{
|
|
||||||
ENABLED("channel-menu-enabled"),
|
|
||||||
DISABLED("channel-menu-disabled"),
|
|
||||||
CANDIDATE("channel-menu-candidate");
|
|
||||||
|
|
||||||
private final String mStyleClass;
|
|
||||||
|
|
||||||
State(String styleClass)
|
|
||||||
{
|
|
||||||
mStyleClass = styleClass;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getStyleClass()
|
|
||||||
{
|
|
||||||
return mStyleClass;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private ChannelMenus()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Channel entry submenu showing the title and details
|
|
||||||
* @param title of the channel
|
|
||||||
* @param details line, or null
|
|
||||||
* @param state of the channel
|
|
||||||
* @param key identifying the channel, e.g. the playlist channel, so the display lists it once, or null
|
|
||||||
*/
|
|
||||||
public static Menu createEntry(String title, String details, State state, Object key)
|
|
||||||
{
|
|
||||||
Label titleLabel = new Label(title);
|
|
||||||
titleLabel.getStyleClass().add(STYLE_TITLE);
|
|
||||||
VBox box = new VBox(titleLabel);
|
|
||||||
|
|
||||||
if(details != null)
|
|
||||||
{
|
|
||||||
Label detailLabel = new Label(details);
|
|
||||||
detailLabel.getStyleClass().add(STYLE_DETAIL);
|
|
||||||
box.getChildren().add(detailLabel);
|
|
||||||
}
|
|
||||||
|
|
||||||
Menu menu = new Menu(null, box);
|
|
||||||
menu.getStyleClass().addAll(STYLE_ITEM, state.getStyleClass());
|
|
||||||
menu.setUserData(key);
|
|
||||||
return menu;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Entry for a playlist channel: enable or disable it, and view or edit it in the playlist editor
|
|
||||||
* @param channel in the playlist
|
|
||||||
* @param tunerChannel of the channel to describe, or null for the channel's first
|
|
||||||
* @param toggle that enables the channel when it's disabled or disables it when it's enabled, or null when the
|
|
||||||
* channel can't be started or stopped from the menu, e.g. a traffic channel
|
|
||||||
*/
|
|
||||||
public static Menu createChannelEntry(Channel channel, TunerChannel tunerChannel, Runnable toggle)
|
|
||||||
{
|
|
||||||
boolean processing = channel.isProcessing();
|
|
||||||
State state = getState(channel);
|
|
||||||
Menu menu = createEntry(getTitle(channel), String.join(" \u00B7 ", getDetails(channel, tunerChannel)), state,
|
|
||||||
channel);
|
|
||||||
|
|
||||||
if(toggle != null)
|
|
||||||
{
|
|
||||||
menu.getItems().add(createItem(processing ? "Disable" : "Enable", state, toggle));
|
|
||||||
}
|
|
||||||
|
|
||||||
menu.getItems().add(createItem("View/Edit in Playlist", state,
|
|
||||||
() -> MyEventBus.getGlobalEventBus().post(new ViewChannelRequest(channel))));
|
|
||||||
return menu;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Hover card entry for a playlist channel
|
|
||||||
* @param channel in the playlist
|
|
||||||
* @param tunerChannel of the channel to describe, or null for the channel's first
|
|
||||||
* @param prompts true when the entry is reason to show the card
|
|
||||||
*/
|
|
||||||
public static ChannelCardEntry createCardEntry(Channel channel, TunerChannel tunerChannel, boolean prompts)
|
|
||||||
{
|
|
||||||
//One details line, as in the menu entry, so the card has room for more channels
|
|
||||||
return new ChannelCardEntry(getTitle(channel), List.of(String.join(" \u00B7 ", getDetails(channel,
|
|
||||||
tunerChannel))), getState(channel), channel, prompts);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* State of a playlist channel
|
|
||||||
*/
|
|
||||||
public static State getState(Channel channel)
|
|
||||||
{
|
|
||||||
return channel.isProcessing() ? State.ENABLED : State.DISABLED;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static String getTitle(Channel channel)
|
|
||||||
{
|
|
||||||
return channel.getName() != null && !channel.getName().isEmpty() ? channel.getName() : "(unnamed)";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Detail lines of a playlist channel: the system and site, then the decoder, frequency and state
|
|
||||||
* @param tunerChannel of the channel to describe, or null for the channel's first
|
|
||||||
*/
|
|
||||||
public static List<String> getDetails(Channel channel, TunerChannel tunerChannel)
|
|
||||||
{
|
|
||||||
if(tunerChannel == null)
|
|
||||||
{
|
|
||||||
List<TunerChannel> tunerChannels = channel.getTunerChannels();
|
|
||||||
tunerChannel = tunerChannels.isEmpty() ? null : tunerChannels.get(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
List<String> details = new ArrayList<>();
|
|
||||||
String systemSite = join(channel.hasSystem() ? channel.getSystem() : null,
|
|
||||||
channel.hasSite() ? channel.getSite() : null);
|
|
||||||
|
|
||||||
if(systemSite != null)
|
|
||||||
{
|
|
||||||
details.add(systemSite);
|
|
||||||
}
|
|
||||||
|
|
||||||
details.add(join(channel.getDecodeConfiguration().getDecoderType().getShortDisplayString(),
|
|
||||||
tunerChannel != null ? FREQUENCY_FORMAT.format(tunerChannel.getFrequency() / 1E6) + " MHz" : null,
|
|
||||||
channel.isProcessing() ? "Enabled" : "Disabled"));
|
|
||||||
return details;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Action item of an entry's submenu
|
|
||||||
*/
|
|
||||||
public static MenuItem createItem(String text, State state, Runnable action)
|
|
||||||
{
|
|
||||||
MenuItem item = new MenuItem(text);
|
|
||||||
item.getStyleClass().addAll(STYLE_ITEM, state.getStyleClass());
|
|
||||||
item.setOnAction(event -> action.run());
|
|
||||||
return item;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Inactive item of an entry's submenu that explains something, e.g. why a candidate can't be added
|
|
||||||
*/
|
|
||||||
public static MenuItem createNote(String text)
|
|
||||||
{
|
|
||||||
MenuItem item = new MenuItem(text);
|
|
||||||
item.getStyleClass().addAll(STYLE_ITEM, STYLE_NOTE);
|
|
||||||
item.setDisable(true);
|
|
||||||
return item;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Separator of an entry's submenu
|
|
||||||
*/
|
|
||||||
public static SeparatorMenuItem createSeparator()
|
|
||||||
{
|
|
||||||
SeparatorMenuItem separator = new SeparatorMenuItem();
|
|
||||||
separator.getStyleClass().add(STYLE_ITEM);
|
|
||||||
return separator;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gives the context menu's channel entries the theme's colors. The stylesheet goes into the scenes of the menu
|
|
||||||
* and the entry submenus, since a popup takes its owner's stylesheets when it's shown and the application theme's
|
|
||||||
* stylesheets are added to each popup's scene: the more specific rules win in the same scene.
|
|
||||||
*/
|
|
||||||
public static void style(ContextMenu menu, SpectralDisplayTheme theme)
|
|
||||||
{
|
|
||||||
String stylesheet = createStylesheet(theme);
|
|
||||||
menu.addEventHandler(WindowEvent.WINDOW_SHOWN, event -> addStylesheet(menu.getScene(), stylesheet));
|
|
||||||
|
|
||||||
for(MenuItem item: menu.getItems())
|
|
||||||
{
|
|
||||||
if(item instanceof Menu entry && entry.getStyleClass().contains(STYLE_ITEM))
|
|
||||||
{
|
|
||||||
//The submenu's popup isn't exposed, but its items' nodes are in its scene once it's showing
|
|
||||||
EventHandler<Event> handler = event -> {
|
|
||||||
for(MenuItem child: entry.getItems())
|
|
||||||
{
|
|
||||||
Node node = child.getStyleableNode();
|
|
||||||
|
|
||||||
if(node != null && node.getScene() != null)
|
|
||||||
{
|
|
||||||
addStylesheet(node.getScene(), stylesheet);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
entry.setOnShowing(handler);
|
|
||||||
entry.setOnShown(handler);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void addStylesheet(Scene scene, String stylesheet)
|
|
||||||
{
|
|
||||||
if(scene != null && !scene.getStylesheets().contains(stylesheet))
|
|
||||||
{
|
|
||||||
scene.getStylesheets().add(stylesheet);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Stylesheet with the theme's colors
|
|
||||||
* @return data URL of the stylesheet
|
|
||||||
*/
|
|
||||||
static String createStylesheet(SpectralDisplayTheme theme)
|
|
||||||
{
|
|
||||||
Color background = opaque(theme.getBackground());
|
|
||||||
String detail = css(readable(opaque(theme.getLine()), background));
|
|
||||||
String item = ".menu-item." + STYLE_ITEM;
|
|
||||||
StringBuilder sb = new StringBuilder();
|
|
||||||
sb.append(item).append(" { -fx-background-color: ").append(css(background)).append("; }\n");
|
|
||||||
sb.append(item).append(":focused, ").append(item).append(":hover { -fx-background-color: ")
|
|
||||||
.append(css(background)).append(", ").append(css(theme.getLine(0.35))).append("; }\n");
|
|
||||||
sb.append(item).append(":disabled, ").append(item).append(":disabled .label { -fx-opacity: 1; }\n");
|
|
||||||
|
|
||||||
for(State state: State.values())
|
|
||||||
{
|
|
||||||
String color = css(readable(getColor(theme, state), background));
|
|
||||||
String stateItem = item + "." + state.getStyleClass();
|
|
||||||
//The item labels, and the title of an entry
|
|
||||||
sb.append(textRules(color, stateItem + " .label", stateItem + ":focused .label",
|
|
||||||
stateItem + ":hover .label"));
|
|
||||||
}
|
|
||||||
|
|
||||||
//More specific than the state rules, so the details keep their color on hover
|
|
||||||
sb.append(textRules(detail, item + " .label." + STYLE_DETAIL, item + ":focused .label." + STYLE_DETAIL,
|
|
||||||
item + ":hover .label." + STYLE_DETAIL, item + "." + STYLE_NOTE + " .label"));
|
|
||||||
sb.append(item).append(" .label.").append(STYLE_TITLE).append(" { -fx-font-weight: bold; }\n");
|
|
||||||
sb.append(".menu.").append(STYLE_ITEM).append(" > .right-container > .arrow { -fx-background-color: ")
|
|
||||||
.append(detail).append("; }\n");
|
|
||||||
sb.append(".separator-menu-item.").append(STYLE_ITEM).append(" { -fx-padding: 0.25em 0; }\n");
|
|
||||||
sb.append(".separator-menu-item.").append(STYLE_ITEM).append(" > .line { -fx-border-color: ")
|
|
||||||
.append(css(theme.getLine(0.5)))
|
|
||||||
.append(" transparent transparent transparent; -fx-border-insets: 0; -fx-padding: 0; }\n");
|
|
||||||
return "data:text/css;base64," +
|
|
||||||
Base64.getEncoder().encodeToString(sb.toString().getBytes(StandardCharsets.UTF_8));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Title color of the state: the theme's active color (a green) for an enabled playlist channel, its inactive
|
|
||||||
* color (a blue) for a disabled one, and its plain text color for a radio reference candidate
|
|
||||||
*/
|
|
||||||
public static Color getColor(SpectralDisplayTheme theme, State state)
|
|
||||||
{
|
|
||||||
return switch(state)
|
|
||||||
{
|
|
||||||
case ENABLED -> theme.getChannelActive();
|
|
||||||
case DISABLED -> theme.getChannelInactive();
|
|
||||||
case CANDIDATE -> theme.getText();
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Color moved toward white on a dark background, or black on a light one, until it's readable on the background
|
|
||||||
*/
|
|
||||||
public static Color readable(Color color, Color background)
|
|
||||||
{
|
|
||||||
Color target = luminance(background) < 0.5 ? Color.WHITE : Color.BLACK;
|
|
||||||
Color adjusted = color;
|
|
||||||
|
|
||||||
for(int step = 1; step <= 10 && contrast(adjusted, background) < MIN_CONTRAST; step++)
|
|
||||||
{
|
|
||||||
adjusted = color.interpolate(target, step / 10.0);
|
|
||||||
}
|
|
||||||
|
|
||||||
return adjusted;
|
|
||||||
}
|
|
||||||
|
|
||||||
static double contrast(Color a, Color b)
|
|
||||||
{
|
|
||||||
double la = luminance(a);
|
|
||||||
double lb = luminance(b);
|
|
||||||
return (Math.max(la, lb) + 0.05) / (Math.min(la, lb) + 0.05);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static double luminance(Color color)
|
|
||||||
{
|
|
||||||
return (0.2126 * linear(color.getRed())) + (0.7152 * linear(color.getGreen())) +
|
|
||||||
(0.0722 * linear(color.getBlue()));
|
|
||||||
}
|
|
||||||
|
|
||||||
private static double linear(double channel)
|
|
||||||
{
|
|
||||||
return channel <= 0.03928 ? channel / 12.92 : Math.pow((channel + 0.055) / 1.055, 2.4);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Rules that set the text color of the labels and of their text nodes. The dark application theme fills each
|
|
||||||
* label's text node, so both are set.
|
|
||||||
*/
|
|
||||||
private static String textRules(String color, String... labelSelectors)
|
|
||||||
{
|
|
||||||
String labels = String.join(", ", labelSelectors);
|
|
||||||
String texts = String.join(" .text, ", labelSelectors) + " .text";
|
|
||||||
return labels + " { -fx-text-fill: " + color + "; }\n" + texts + " { -fx-fill: " + color + "; }\n";
|
|
||||||
}
|
|
||||||
|
|
||||||
private static Color opaque(Color color)
|
|
||||||
{
|
|
||||||
return Color.color(color.getRed(), color.getGreen(), color.getBlue());
|
|
||||||
}
|
|
||||||
|
|
||||||
private static String css(Color color)
|
|
||||||
{
|
|
||||||
return String.format(Locale.ROOT, "rgba(%d,%d,%d,%.3f)", Math.round(color.getRed() * 255),
|
|
||||||
Math.round(color.getGreen() * 255), Math.round(color.getBlue() * 255), color.getOpacity());
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Values joined with a middle dot, skipping null and empty values
|
|
||||||
*/
|
|
||||||
public static String join(String... values)
|
|
||||||
{
|
|
||||||
StringBuilder sb = new StringBuilder();
|
|
||||||
|
|
||||||
for(String value: values)
|
|
||||||
{
|
|
||||||
if(value != null && !value.isEmpty())
|
|
||||||
{
|
|
||||||
if(!sb.isEmpty())
|
|
||||||
{
|
|
||||||
sb.append(" · ");
|
|
||||||
}
|
|
||||||
|
|
||||||
sb.append(value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return sb.isEmpty() ? null : sb.toString();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -20,12 +20,6 @@
|
|||||||
package io.github.dsheirer.gui.spectrum;
|
package io.github.dsheirer.gui.spectrum;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.IdentityHashMap;
|
|
||||||
import java.util.LinkedHashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Set;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.concurrent.ConcurrentLinkedQueue;
|
import java.util.concurrent.ConcurrentLinkedQueue;
|
||||||
import java.util.concurrent.CopyOnWriteArrayList;
|
import java.util.concurrent.CopyOnWriteArrayList;
|
||||||
@@ -1126,54 +1120,16 @@ public class SpectralDisplay extends StackPane
|
|||||||
double xFraction = width > 0 ? event.getX() / width : 0.5;
|
double xFraction = width > 0 ? event.getX() / width : 0.5;
|
||||||
ContextMenu menu = new ContextMenu();
|
ContextMenu menu = new ContextMenu();
|
||||||
|
|
||||||
//Items of the layers grouped by section, in layer order. A layer without a section is a group of its own.
|
|
||||||
Map<Object,List<MenuItem>> groups = new LinkedHashMap<>();
|
|
||||||
Map<Object,Map<Object,MenuItem>> listed = new HashMap<>();
|
|
||||||
|
|
||||||
for(SpectralDisplayLayer layer: mLayers)
|
for(SpectralDisplayLayer layer: mLayers)
|
||||||
{
|
{
|
||||||
List<MenuItem> items = layer.getContextMenuItems(pane.getSection(), frequency);
|
List<MenuItem> items = layer.getContextMenuItems(pane.getSection(), frequency);
|
||||||
|
|
||||||
if(items == null || items.isEmpty())
|
if(items != null && !items.isEmpty())
|
||||||
{
|
{
|
||||||
continue;
|
menu.getItems().addAll(items);
|
||||||
}
|
|
||||||
|
|
||||||
Object key = layer.getContextMenuSection() != null ? layer.getContextMenuSection() : layer;
|
|
||||||
List<MenuItem> group = groups.computeIfAbsent(key, k -> new ArrayList<>());
|
|
||||||
Map<Object,MenuItem> keys = listed.computeIfAbsent(key, k -> new IdentityHashMap<>());
|
|
||||||
|
|
||||||
for(MenuItem item: items)
|
|
||||||
{
|
|
||||||
MenuItem earlier = item.getUserData() != null ? keys.get(item.getUserData()) : null;
|
|
||||||
|
|
||||||
if(earlier != null)
|
|
||||||
{
|
|
||||||
//The same channel from another layer is listed once, with the other layer's options added
|
|
||||||
mergeOptions(earlier, item);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if(item.getUserData() != null)
|
|
||||||
{
|
|
||||||
keys.put(item.getUserData(), item);
|
|
||||||
}
|
|
||||||
|
|
||||||
group.add(item);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for(Map.Entry<Object,List<MenuItem>> group: groups.entrySet())
|
|
||||||
{
|
|
||||||
if(group.getKey() instanceof String section)
|
|
||||||
{
|
|
||||||
menu.getItems().add(SpectralDisplayLayer.createSectionHeader(section));
|
|
||||||
}
|
|
||||||
|
|
||||||
menu.getItems().addAll(group.getValue());
|
|
||||||
menu.getItems().add(new SeparatorMenuItem());
|
menu.getItems().add(new SeparatorMenuItem());
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Menu zoomMenu = new Menu("Zoom");
|
Menu zoomMenu = new Menu("Zoom");
|
||||||
ToggleGroup zoomGroup = new ToggleGroup();
|
ToggleGroup zoomGroup = new ToggleGroup();
|
||||||
@@ -1198,97 +1154,11 @@ public class SpectralDisplay extends StackPane
|
|||||||
menu.getItems().add(pause);
|
menu.getItems().add(pause);
|
||||||
}
|
}
|
||||||
|
|
||||||
alignLabels(menu.getItems());
|
|
||||||
ChannelMenus.style(menu, getTheme());
|
|
||||||
mContextMenu = menu;
|
mContextMenu = menu;
|
||||||
menu.show(pane, event.getScreenX(), event.getScreenY());
|
menu.show(pane, event.getScreenX(), event.getScreenY());
|
||||||
event.consume();
|
event.consume();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Adds the submenu options of a later entry for the same channel that the earlier entry doesn't have, e.g. the
|
|
||||||
* radio reference layer's option to view a playlist channel's listing. When the later entry has all of the
|
|
||||||
* earlier entry's options, the earlier entry takes the later entry's options in their order, otherwise the
|
|
||||||
* missing options are added after a separator.
|
|
||||||
*/
|
|
||||||
private static void mergeOptions(MenuItem earlier, MenuItem later)
|
|
||||||
{
|
|
||||||
if(!(earlier instanceof Menu earlierMenu) || !(later instanceof Menu laterMenu))
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
Set<String> earlierTexts = getOptionTexts(earlierMenu);
|
|
||||||
Set<String> laterTexts = getOptionTexts(laterMenu);
|
|
||||||
|
|
||||||
if(laterTexts.containsAll(earlierTexts))
|
|
||||||
{
|
|
||||||
if(laterTexts.size() > earlierTexts.size())
|
|
||||||
{
|
|
||||||
//Items belong to one menu, so they're moved
|
|
||||||
List<MenuItem> options = new ArrayList<>(laterMenu.getItems());
|
|
||||||
laterMenu.getItems().clear();
|
|
||||||
earlierMenu.getItems().setAll(options);
|
|
||||||
}
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
List<MenuItem> added = new ArrayList<>();
|
|
||||||
|
|
||||||
for(MenuItem option: laterMenu.getItems())
|
|
||||||
{
|
|
||||||
if(!(option instanceof SeparatorMenuItem) && option.getText() != null &&
|
|
||||||
!earlierTexts.contains(option.getText()))
|
|
||||||
{
|
|
||||||
added.add(option);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(!added.isEmpty())
|
|
||||||
{
|
|
||||||
laterMenu.getItems().removeAll(added);
|
|
||||||
earlierMenu.getItems().add(ChannelMenus.createSeparator());
|
|
||||||
earlierMenu.getItems().addAll(added);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static Set<String> getOptionTexts(Menu menu)
|
|
||||||
{
|
|
||||||
Set<String> texts = new HashSet<>();
|
|
||||||
|
|
||||||
for(MenuItem option: menu.getItems())
|
|
||||||
{
|
|
||||||
if(!(option instanceof SeparatorMenuItem) && option.getText() != null)
|
|
||||||
{
|
|
||||||
texts.add(option.getText());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return texts;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A context menu places item text in a column after the widest graphic, so when a layer's items show their
|
|
||||||
* content as a graphic, the text of the other items is moved into a graphic too, to line up on the left.
|
|
||||||
*/
|
|
||||||
private static void alignLabels(List<MenuItem> items)
|
|
||||||
{
|
|
||||||
if(items.stream().noneMatch(item -> item.getGraphic() != null && !(item instanceof SeparatorMenuItem)))
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
for(MenuItem item: items)
|
|
||||||
{
|
|
||||||
if(item.getGraphic() == null && item.getText() != null && !(item instanceof SeparatorMenuItem))
|
|
||||||
{
|
|
||||||
item.setGraphic(new Label(item.getText()));
|
|
||||||
item.setText(null);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Resizable pane that holds a canvas for one display section.
|
* Resizable pane that holds a canvas for one display section.
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -147,44 +147,6 @@ public abstract class SpectralDisplayLayer
|
|||||||
return Collections.emptyList();
|
return Collections.emptyList();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Channels at the mouse position for the display's Channels hover card (see
|
|
||||||
* {@link io.github.dsheirer.gui.spectrum.layer.ChannelCardLayer}). Called on the JavaFX application thread while
|
|
||||||
* the mouse rests over the display, so it should be quick.
|
|
||||||
* @param cursor mouse position
|
|
||||||
* @param area of the section under the mouse
|
|
||||||
* @return entries, or an empty list
|
|
||||||
*/
|
|
||||||
public List<ChannelCardEntry> getCardEntries(DisplayCursor cursor, RenderArea area)
|
|
||||||
{
|
|
||||||
return Collections.emptyList();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Context menu section of this layer's items. The items of layers with the same section are listed together
|
|
||||||
* under a header with the section name, each item once: an item whose user data is the same object as an earlier
|
|
||||||
* item's in the section is left out.
|
|
||||||
* @return section name, or null for items of their own without a header
|
|
||||||
*/
|
|
||||||
public String getContextMenuSection()
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Section header for context menu items: an inactive item with smaller bold text in the theme's text color,
|
|
||||||
* slightly faded. Inline styles, since the application theme's stylesheets are added to each popup's scene.
|
|
||||||
* @param title of the section
|
|
||||||
*/
|
|
||||||
public static MenuItem createSectionHeader(String title)
|
|
||||||
{
|
|
||||||
MenuItem header = new MenuItem(title);
|
|
||||||
header.setDisable(true);
|
|
||||||
header.getStyleClass().add("spectral-menu-section-header");
|
|
||||||
header.setStyle("-fx-opacity: 0.6; -fx-font-size: 0.85em; -fx-font-weight: bold;");
|
|
||||||
return header;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Title of this layer's section in the configuration panel, or null to place the layer's rows in the panel's
|
* Title of this layer's section in the configuration panel, or null to place the layer's rows in the panel's
|
||||||
* Display section instead of a section of their own.
|
* Display section instead of a section of their own.
|
||||||
|
|||||||
@@ -239,74 +239,6 @@ public enum SpectralDisplayTheme
|
|||||||
return mCorrection;
|
return mCorrection;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Text color for an active (enabled) playlist channel in the Channels menu and card: a green that reads as
|
|
||||||
* active on the theme's background, or the theme's own highlight in the monochrome themes. Red/green color
|
|
||||||
* blind themes use a yellowish green and blue/yellow color blind themes a green that stays distinct from
|
|
||||||
* {@link #getChannelInactive()}.
|
|
||||||
*/
|
|
||||||
public Color getChannelActive()
|
|
||||||
{
|
|
||||||
return Color.web(switch(this)
|
|
||||||
{
|
|
||||||
case CLASSIC -> "#33E633";
|
|
||||||
case DARK -> "#66BB6A";
|
|
||||||
case MEDIUM -> "#81C784";
|
|
||||||
case LIGHT -> "#2E7D32";
|
|
||||||
case GREEN_PHOSPHOR -> "#66FF8C";
|
|
||||||
case AMBER -> "#FFC233";
|
|
||||||
case GRAYSCALE -> "#FFFFFF";
|
|
||||||
case HIGH_CONTRAST_DARK -> "#00FF00";
|
|
||||||
case HIGH_CONTRAST_LIGHT -> "#006400";
|
|
||||||
case VIRIDIS -> "#6DCD59";
|
|
||||||
case CIVIDIS -> "#B4DE2C";
|
|
||||||
case INFERNO -> "#4CC764";
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Text color for an inactive (disabled) playlist channel in the Channels menu and card: a blue that reads as
|
|
||||||
* inactive on the theme's background, or a dimmed shade in the monochrome themes. The blue/yellow color blind
|
|
||||||
* theme uses a pink, since blue and green look alike there.
|
|
||||||
*/
|
|
||||||
public Color getChannelInactive()
|
|
||||||
{
|
|
||||||
return Color.web(switch(this)
|
|
||||||
{
|
|
||||||
case CLASSIC -> "#4D9FFF";
|
|
||||||
case DARK -> "#64B5F6";
|
|
||||||
case MEDIUM -> "#90CAF9";
|
|
||||||
case LIGHT -> "#1565C0";
|
|
||||||
case GREEN_PHOSPHOR -> "#3FAF5C";
|
|
||||||
case AMBER -> "#B07A10";
|
|
||||||
case GRAYSCALE -> "#8C8C8C";
|
|
||||||
case HIGH_CONTRAST_DARK -> "#00BFFF";
|
|
||||||
case HIGH_CONTRAST_LIGHT -> "#0000C0";
|
|
||||||
case VIRIDIS -> "#5B9BF0";
|
|
||||||
case CIVIDIS -> "#56B4E9";
|
|
||||||
case INFERNO -> "#E879C6";
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Plain text color on the theme's background, e.g. for menu entries that aren't highlighted
|
|
||||||
*/
|
|
||||||
public Color getText()
|
|
||||||
{
|
|
||||||
return Color.web(switch(this)
|
|
||||||
{
|
|
||||||
case CLASSIC, HIGH_CONTRAST_DARK -> "#FFFFFF";
|
|
||||||
case DARK -> "#E6E8EB";
|
|
||||||
case MEDIUM -> "#F0F4F8";
|
|
||||||
case LIGHT -> "#212529";
|
|
||||||
case GREEN_PHOSPHOR -> "#CCFFCC";
|
|
||||||
case AMBER -> "#FFF0C2";
|
|
||||||
case GRAYSCALE -> "#D0D0D0";
|
|
||||||
case HIGH_CONTRAST_LIGHT -> "#000000";
|
|
||||||
case VIRIDIS, CIVIDIS, INFERNO -> "#E8E8EE";
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ARGB color for the waterfall intensity index (0 - 255).
|
* ARGB color for the waterfall intensity index (0 - 255).
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ package io.github.dsheirer.gui.spectrum;
|
|||||||
import io.github.dsheirer.controller.channel.ChannelModel;
|
import io.github.dsheirer.controller.channel.ChannelModel;
|
||||||
import io.github.dsheirer.controller.channel.ChannelProcessingManager;
|
import io.github.dsheirer.controller.channel.ChannelProcessingManager;
|
||||||
import io.github.dsheirer.gui.playlist.radioreference.RadioReferencePlaylistActions;
|
import io.github.dsheirer.gui.playlist.radioreference.RadioReferencePlaylistActions;
|
||||||
import io.github.dsheirer.gui.spectrum.layer.ChannelCardLayer;
|
|
||||||
import io.github.dsheirer.gui.spectrum.layer.ChannelLayer;
|
import io.github.dsheirer.gui.spectrum.layer.ChannelLayer;
|
||||||
import io.github.dsheirer.gui.spectrum.layer.RadioReferenceLayer;
|
import io.github.dsheirer.gui.spectrum.layer.RadioReferenceLayer;
|
||||||
import io.github.dsheirer.playlist.PlaylistManager;
|
import io.github.dsheirer.playlist.PlaylistManager;
|
||||||
@@ -105,8 +104,8 @@ public class TunerSpectralDisplay extends DftSpectralDisplay implements ISourceE
|
|||||||
private TunerSpectralDisplay(ChannelLayer channelLayer, RadioReferenceLayer radioReferenceLayer,
|
private TunerSpectralDisplay(ChannelLayer channelLayer, RadioReferenceLayer radioReferenceLayer,
|
||||||
DiscoveredTunerModel discoveredTunerModel, boolean saveSettings)
|
DiscoveredTunerModel discoveredTunerModel, boolean saveSettings)
|
||||||
{
|
{
|
||||||
//The channels card draws after the other layers, so it's on top
|
//The radio reference layer draws after the channel layer, so its card is on top
|
||||||
super(SETTINGS_PREFIX, saveSettings, channelLayer, radioReferenceLayer, new ChannelCardLayer());
|
super(SETTINGS_PREFIX, saveSettings, channelLayer, radioReferenceLayer);
|
||||||
mChannelLayer = channelLayer;
|
mChannelLayer = channelLayer;
|
||||||
mRadioReferenceLayer = radioReferenceLayer;
|
mRadioReferenceLayer = radioReferenceLayer;
|
||||||
mDiscoveredTunerModel = discoveredTunerModel;
|
mDiscoveredTunerModel = discoveredTunerModel;
|
||||||
|
|||||||
@@ -1,430 +0,0 @@
|
|||||||
/*
|
|
||||||
* *****************************************************************************
|
|
||||||
* Copyright (C) 2014-2026 Dennis Sheirer
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
|
||||||
* ****************************************************************************
|
|
||||||
*/
|
|
||||||
|
|
||||||
package io.github.dsheirer.gui.spectrum.layer;
|
|
||||||
|
|
||||||
import io.github.dsheirer.gui.spectrum.ChannelCardEntry;
|
|
||||||
import io.github.dsheirer.gui.spectrum.ChannelMenus;
|
|
||||||
import io.github.dsheirer.gui.spectrum.CursorReadout;
|
|
||||||
import io.github.dsheirer.gui.spectrum.DisplayCursor;
|
|
||||||
import io.github.dsheirer.gui.spectrum.DisplaySection;
|
|
||||||
import io.github.dsheirer.gui.spectrum.RenderArea;
|
|
||||||
import io.github.dsheirer.gui.spectrum.SpectralDisplayLayer;
|
|
||||||
import io.github.dsheirer.gui.spectrum.SpectralDisplayModel;
|
|
||||||
import io.github.dsheirer.gui.spectrum.SpectralDisplayTheme;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.Comparator;
|
|
||||||
import java.util.IdentityHashMap;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Set;
|
|
||||||
import javafx.animation.PauseTransition;
|
|
||||||
import javafx.geometry.VPos;
|
|
||||||
import javafx.scene.canvas.GraphicsContext;
|
|
||||||
import javafx.scene.paint.Color;
|
|
||||||
import javafx.scene.text.Font;
|
|
||||||
import javafx.scene.text.FontWeight;
|
|
||||||
import javafx.scene.text.Text;
|
|
||||||
import javafx.scene.text.TextAlignment;
|
|
||||||
import javafx.util.Duration;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Channels hover card. When the mouse rests over the spectrum or the waterfall, shows a card next to the mouse with
|
|
||||||
* the channels at the mouse position that the other layers provide (see
|
|
||||||
* {@link SpectralDisplayLayer#getCardEntries}): playlist channels first, then radio reference candidates. The titles
|
|
||||||
* have the colors of the Channels context menu entries: one for an enabled playlist channel, one for a disabled one
|
|
||||||
* and one for a candidate. The card replaces the cursor readout and ends with the readout lines.
|
|
||||||
*
|
|
||||||
* The card is shown when an entry prompts it, e.g. a playlist channel whose labels don't fit in its box or a
|
|
||||||
* candidate; the other channels at the mouse position are then listed too.
|
|
||||||
*/
|
|
||||||
public class ChannelCardLayer extends SpectralDisplayLayer
|
|
||||||
{
|
|
||||||
private static final Duration HOVER_DELAY = Duration.millis(400);
|
|
||||||
private static final Font FONT = Font.font(11);
|
|
||||||
private static final Font TITLE_FONT = Font.font(Font.getDefault().getFamily(), FontWeight.BOLD, 11);
|
|
||||||
private static final int MAX_ENTRIES = 6;
|
|
||||||
private static final double MAX_TEXT_WIDTH = 380;
|
|
||||||
private static final double PADDING = 6;
|
|
||||||
private static final double GAP = 5;
|
|
||||||
//Space beside the text and below the readout lines, as in the cursor readout, so the readout lines stay in place
|
|
||||||
private static final double PADDING_X = 4;
|
|
||||||
//Space kept between the card and the edges of the section
|
|
||||||
private static final double EDGE_MARGIN = 2;
|
|
||||||
private static final double READOUT_PADDING = 2;
|
|
||||||
private static final String HEADER = ChannelMenus.SECTION;
|
|
||||||
|
|
||||||
private final Text mMeasure = new Text();
|
|
||||||
private final double mTextHeight;
|
|
||||||
private PauseTransition mHoverTimer;
|
|
||||||
private DisplaySection mHoverSection;
|
|
||||||
private double mHoverX = Double.NaN;
|
|
||||||
private double mHoverY = Double.NaN;
|
|
||||||
private boolean mHoverReady;
|
|
||||||
private List<ChannelCardEntry> mEntries = Collections.emptyList();
|
|
||||||
private Card mCard;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Card text, measured when the entries or the room change
|
|
||||||
* @param entries lines of each shown entry: the title, then the details
|
|
||||||
* @param states of the shown entries
|
|
||||||
* @param more line, or null
|
|
||||||
* @param textWidth of the widest line
|
|
||||||
* @param lineCount of the header, entry and more lines
|
|
||||||
* @param source entries the card was made from
|
|
||||||
* @param maxTextWidth that the lines were shortened to
|
|
||||||
* @param maxHeight that the card was limited to
|
|
||||||
* @param readoutLines that the card was sized for
|
|
||||||
*/
|
|
||||||
private record Card(List<List<String>> entries, List<ChannelMenus.State> states, String more, double textWidth,
|
|
||||||
int lineCount, List<ChannelCardEntry> source, double maxTextWidth, double maxHeight,
|
|
||||||
int readoutLines)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Constructs an instance
|
|
||||||
*/
|
|
||||||
public ChannelCardLayer()
|
|
||||||
{
|
|
||||||
mMeasure.setFont(FONT);
|
|
||||||
mMeasure.setText("Ag");
|
|
||||||
mTextHeight = Math.ceil(mMeasure.getLayoutBounds().getHeight());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void dispose()
|
|
||||||
{
|
|
||||||
if(mHoverTimer != null)
|
|
||||||
{
|
|
||||||
mHoverTimer.stop();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void renderSpectrumForeground(GraphicsContext gc, RenderArea area)
|
|
||||||
{
|
|
||||||
render(gc, area, DisplaySection.SPECTRUM);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void renderWaterfall(GraphicsContext gc, RenderArea area)
|
|
||||||
{
|
|
||||||
render(gc, area, DisplaySection.WATERFALL);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Draws the card in the section under the mouse once the mouse has rested for the hover delay
|
|
||||||
*/
|
|
||||||
private void render(GraphicsContext gc, RenderArea area, DisplaySection section)
|
|
||||||
{
|
|
||||||
DisplayCursor cursor = getSpectralDisplay() != null ? getSpectralDisplay().getDisplayCursor() : null;
|
|
||||||
trackHover(cursor);
|
|
||||||
|
|
||||||
if(cursor != null && cursor.section() == section && replacesCursorReadout(cursor, area))
|
|
||||||
{
|
|
||||||
drawCard(gc, area, cursor, mEntries);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The card replaces the cursor readout while it's shown: it ends with the readout lines, in the readout's place.
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public boolean replacesCursorReadout(DisplayCursor cursor, RenderArea area)
|
|
||||||
{
|
|
||||||
SpectralDisplayModel model = getModel();
|
|
||||||
|
|
||||||
//Only for the position the mouse rested at - the readout comes back as soon as the mouse moves
|
|
||||||
if(!mHoverReady || model == null || !model.hasSource() || cursor == null || cursor.section() != mHoverSection ||
|
|
||||||
cursor.x() != mHoverX || cursor.y() != mHoverY || area.width() <= 0)
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
mEntries = getEntries(cursor, area);
|
|
||||||
return mEntries.stream().anyMatch(ChannelCardEntry::prompts);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Entries of the other layers, each channel once, playlist channels first
|
|
||||||
*/
|
|
||||||
private List<ChannelCardEntry> getEntries(DisplayCursor cursor, RenderArea area)
|
|
||||||
{
|
|
||||||
List<ChannelCardEntry> entries = new ArrayList<>();
|
|
||||||
Set<Object> keys = Collections.newSetFromMap(new IdentityHashMap<>());
|
|
||||||
|
|
||||||
for(SpectralDisplayLayer layer: getSpectralDisplay().getLayers())
|
|
||||||
{
|
|
||||||
if(layer == this)
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
for(ChannelCardEntry entry: layer.getCardEntries(cursor, area))
|
|
||||||
{
|
|
||||||
if(entry.key() == null || keys.add(entry.key()))
|
|
||||||
{
|
|
||||||
entries.add(entry);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
entries.sort(Comparator.comparing(entry -> entry.state() == ChannelMenus.State.CANDIDATE));
|
|
||||||
return entries;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Restarts the hover delay each time the mouse moves, and hides the card until it passes
|
|
||||||
*/
|
|
||||||
private void trackHover(DisplayCursor cursor)
|
|
||||||
{
|
|
||||||
if(cursor == null)
|
|
||||||
{
|
|
||||||
if(mHoverSection != null)
|
|
||||||
{
|
|
||||||
mHoverSection = null;
|
|
||||||
mHoverReady = false;
|
|
||||||
getHoverTimer().stop();
|
|
||||||
}
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(cursor.section() != mHoverSection || cursor.x() != mHoverX || cursor.y() != mHoverY)
|
|
||||||
{
|
|
||||||
mHoverSection = cursor.section();
|
|
||||||
mHoverX = cursor.x();
|
|
||||||
mHoverY = cursor.y();
|
|
||||||
mHoverReady = false;
|
|
||||||
getHoverTimer().playFromStart();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private PauseTransition getHoverTimer()
|
|
||||||
{
|
|
||||||
if(mHoverTimer == null)
|
|
||||||
{
|
|
||||||
mHoverTimer = new PauseTransition(HOVER_DELAY);
|
|
||||||
mHoverTimer.setOnFinished(event -> {
|
|
||||||
mHoverReady = true;
|
|
||||||
requestRender();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
return mHoverTimer;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Draws the card in place of the cursor readout: beside the mouse and above it, placed like the readout, with the
|
|
||||||
* channels above the readout lines so the frequency and level stay where the readout showed them. The card fits
|
|
||||||
* the larger side of the mouse and the height of the section, showing as many channels as fit.
|
|
||||||
*/
|
|
||||||
private void drawCard(GraphicsContext gc, RenderArea area, DisplayCursor cursor, List<ChannelCardEntry> entries)
|
|
||||||
{
|
|
||||||
//The level line changes with the mouse height while the channels don't
|
|
||||||
List<String> readout = CursorReadout.lines(cursor, area, getModel());
|
|
||||||
double readoutWidth = 0;
|
|
||||||
|
|
||||||
for(String line: readout)
|
|
||||||
{
|
|
||||||
readoutWidth = Math.max(readoutWidth, measure(line, FONT));
|
|
||||||
}
|
|
||||||
|
|
||||||
double room = Math.max(area.width() - cursor.x(), cursor.x()) - CursorReadout.GAP_X - EDGE_MARGIN;
|
|
||||||
double maxTextWidth = Math.max(readoutWidth, Math.min(MAX_TEXT_WIDTH, room - (PADDING_X * 2)));
|
|
||||||
//Above the mouse, so the readout lines stay where the readout showed them, when an entry fits there
|
|
||||||
double above = cursor.y() - CursorReadout.GAP_Y;
|
|
||||||
double maxHeight = above >= cardHeight(5, 1, true, readout.size()) ? above : area.plotHeight() - EDGE_MARGIN;
|
|
||||||
|
|
||||||
if(mCard == null || !mCard.source().equals(entries) || mCard.maxTextWidth() != maxTextWidth ||
|
|
||||||
mCard.maxHeight() != maxHeight || mCard.readoutLines() != readout.size())
|
|
||||||
{
|
|
||||||
mCard = createCard(entries, maxTextWidth, maxHeight, readout.size());
|
|
||||||
}
|
|
||||||
|
|
||||||
Card card = mCard;
|
|
||||||
SpectralDisplayTheme theme = getSpectralDisplay().getTheme();
|
|
||||||
Color background = opaque(theme.getBackground());
|
|
||||||
Color detail = opaque(theme.getLine());
|
|
||||||
double width = Math.max(card.textWidth(), readoutWidth) + (PADDING_X * 2);
|
|
||||||
double height = cardHeight(card.lineCount(), card.entries().size(), card.more() != null, readout.size());
|
|
||||||
double x = Math.max(0, CursorReadout.x(cursor, width, area));
|
|
||||||
double y = CursorReadout.y(cursor, height, area);
|
|
||||||
|
|
||||||
gc.setFill(theme.getBackground(0.92));
|
|
||||||
gc.fillRoundRect(x, y, width, height, 8, 8);
|
|
||||||
gc.setStroke(detail);
|
|
||||||
gc.setLineWidth(1.0);
|
|
||||||
gc.strokeRoundRect(Math.floor(x) + 0.5, Math.floor(y) + 0.5, width, height, 8, 8);
|
|
||||||
gc.setTextAlign(TextAlignment.LEFT);
|
|
||||||
gc.setTextBaseline(VPos.TOP);
|
|
||||||
|
|
||||||
double textX = x + PADDING_X;
|
|
||||||
double lineY = y + PADDING;
|
|
||||||
gc.setFill(detail);
|
|
||||||
gc.setFont(TITLE_FONT);
|
|
||||||
gc.fillText(HEADER, textX, lineY);
|
|
||||||
lineY += mTextHeight + GAP;
|
|
||||||
|
|
||||||
for(int index = 0; index < card.entries().size(); index++)
|
|
||||||
{
|
|
||||||
List<String> lines = card.entries().get(index);
|
|
||||||
gc.setFill(ChannelMenus.readable(ChannelMenus.getColor(theme, card.states().get(index)), background));
|
|
||||||
gc.setFont(TITLE_FONT);
|
|
||||||
gc.fillText(lines.get(0), textX, lineY);
|
|
||||||
lineY += mTextHeight;
|
|
||||||
gc.setFill(detail);
|
|
||||||
gc.setFont(FONT);
|
|
||||||
|
|
||||||
for(int line = 1; line < lines.size(); line++)
|
|
||||||
{
|
|
||||||
gc.fillText(lines.get(line), textX, lineY);
|
|
||||||
lineY += mTextHeight;
|
|
||||||
}
|
|
||||||
|
|
||||||
lineY += GAP;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(card.more() != null)
|
|
||||||
{
|
|
||||||
gc.setFill(detail);
|
|
||||||
gc.setFont(FONT);
|
|
||||||
gc.fillText(card.more(), textX, lineY);
|
|
||||||
lineY += mTextHeight + GAP;
|
|
||||||
}
|
|
||||||
|
|
||||||
//The readout lines, separated from the channels, in the readout's style
|
|
||||||
double separator = Math.floor(lineY - (GAP / 2.0)) + 0.5;
|
|
||||||
gc.setStroke(theme.getLine(0.5));
|
|
||||||
gc.strokeLine(textX, separator, x + width - PADDING_X, separator);
|
|
||||||
gc.setFill(theme.getCursor());
|
|
||||||
gc.setFont(FONT);
|
|
||||||
|
|
||||||
for(String line: readout)
|
|
||||||
{
|
|
||||||
gc.fillText(line, textX, lineY);
|
|
||||||
lineY += mTextHeight;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Height of a card with the lines
|
|
||||||
* @param lineCount of the header, entry and more lines
|
|
||||||
* @param entries number of entries
|
|
||||||
* @param more true when the card has a more line
|
|
||||||
* @param readoutLines number of readout lines
|
|
||||||
*/
|
|
||||||
private double cardHeight(int lineCount, int entries, boolean more, int readoutLines)
|
|
||||||
{
|
|
||||||
int gaps = 1 + entries + (more ? 1 : 0);
|
|
||||||
return ((lineCount + readoutLines) * mTextHeight) + (gaps * GAP) + PADDING + READOUT_PADDING;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Card text for as many entries as fit the height, shortened to the width
|
|
||||||
*/
|
|
||||||
private Card createCard(List<ChannelCardEntry> source, double maxTextWidth, double maxHeight, int readoutLines)
|
|
||||||
{
|
|
||||||
int limit = Math.min(source.size(), MAX_ENTRIES);
|
|
||||||
List<List<String>> entries = new ArrayList<>();
|
|
||||||
List<ChannelMenus.State> states = new ArrayList<>();
|
|
||||||
double textWidth = measure(HEADER, TITLE_FONT);
|
|
||||||
int lineCount = 1;
|
|
||||||
|
|
||||||
for(int index = 0; index < limit; index++)
|
|
||||||
{
|
|
||||||
ChannelCardEntry entry = source.get(index);
|
|
||||||
List<String> lines = new ArrayList<>();
|
|
||||||
lines.add(fit(entry.title(), TITLE_FONT, maxTextWidth));
|
|
||||||
|
|
||||||
for(String detail: entry.details())
|
|
||||||
{
|
|
||||||
if(detail != null)
|
|
||||||
{
|
|
||||||
lines.add(fit(detail, FONT, maxTextWidth));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//Keep room for the more line when entries are left out
|
|
||||||
boolean more = index + 1 < source.size();
|
|
||||||
|
|
||||||
if(!entries.isEmpty() && cardHeight(lineCount + lines.size() + (more ? 1 : 0), entries.size() + 1, more,
|
|
||||||
readoutLines) > maxHeight)
|
|
||||||
{
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
textWidth = Math.max(textWidth, measure(lines.get(0), TITLE_FONT));
|
|
||||||
|
|
||||||
for(int line = 1; line < lines.size(); line++)
|
|
||||||
{
|
|
||||||
textWidth = Math.max(textWidth, measure(lines.get(line), FONT));
|
|
||||||
}
|
|
||||||
|
|
||||||
lineCount += lines.size();
|
|
||||||
entries.add(lines);
|
|
||||||
states.add(entry.state());
|
|
||||||
}
|
|
||||||
|
|
||||||
String more = source.size() > entries.size() ? "+ " + (source.size() - entries.size()) + " more" : null;
|
|
||||||
|
|
||||||
if(more != null)
|
|
||||||
{
|
|
||||||
textWidth = Math.max(textWidth, measure(more, FONT));
|
|
||||||
lineCount++;
|
|
||||||
}
|
|
||||||
|
|
||||||
return new Card(entries, states, more, textWidth, lineCount, source, maxTextWidth, maxHeight, readoutLines);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Text shortened with an ellipsis to fit the width
|
|
||||||
*/
|
|
||||||
private String fit(String text, Font font, double maxWidth)
|
|
||||||
{
|
|
||||||
if(measure(text, font) <= maxWidth)
|
|
||||||
{
|
|
||||||
return text;
|
|
||||||
}
|
|
||||||
|
|
||||||
int length = text.length();
|
|
||||||
|
|
||||||
while(length > 1 && measure(text.substring(0, length) + "…", font) > maxWidth)
|
|
||||||
{
|
|
||||||
length--;
|
|
||||||
}
|
|
||||||
|
|
||||||
return text.substring(0, length) + "…";
|
|
||||||
}
|
|
||||||
|
|
||||||
private double measure(String text, Font font)
|
|
||||||
{
|
|
||||||
mMeasure.setFont(font);
|
|
||||||
mMeasure.setText(text);
|
|
||||||
double width = mMeasure.getLayoutBounds().getWidth();
|
|
||||||
mMeasure.setFont(FONT);
|
|
||||||
return width;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static Color opaque(Color color)
|
|
||||||
{
|
|
||||||
return Color.color(color.getRed(), color.getGreen(), color.getBlue());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -24,8 +24,8 @@ import io.github.dsheirer.controller.channel.ChannelEvent;
|
|||||||
import io.github.dsheirer.controller.channel.ChannelException;
|
import io.github.dsheirer.controller.channel.ChannelException;
|
||||||
import io.github.dsheirer.controller.channel.ChannelModel;
|
import io.github.dsheirer.controller.channel.ChannelModel;
|
||||||
import io.github.dsheirer.controller.channel.ChannelProcessingManager;
|
import io.github.dsheirer.controller.channel.ChannelProcessingManager;
|
||||||
import io.github.dsheirer.gui.spectrum.ChannelCardEntry;
|
import io.github.dsheirer.eventbus.MyEventBus;
|
||||||
import io.github.dsheirer.gui.spectrum.ChannelMenus;
|
import io.github.dsheirer.gui.playlist.channel.ViewChannelRequest;
|
||||||
import io.github.dsheirer.gui.spectrum.ConfigurationRow;
|
import io.github.dsheirer.gui.spectrum.ConfigurationRow;
|
||||||
import io.github.dsheirer.gui.spectrum.DisplayCursor;
|
import io.github.dsheirer.gui.spectrum.DisplayCursor;
|
||||||
import io.github.dsheirer.gui.spectrum.DisplaySection;
|
import io.github.dsheirer.gui.spectrum.DisplaySection;
|
||||||
@@ -56,6 +56,7 @@ import javafx.scene.control.MenuItem;
|
|||||||
import javafx.scene.control.Tooltip;
|
import javafx.scene.control.Tooltip;
|
||||||
import javafx.scene.paint.Color;
|
import javafx.scene.paint.Color;
|
||||||
import javafx.scene.text.Font;
|
import javafx.scene.text.Font;
|
||||||
|
import javafx.scene.text.FontWeight;
|
||||||
import javafx.scene.text.Text;
|
import javafx.scene.text.Text;
|
||||||
import javafx.scene.text.TextAlignment;
|
import javafx.scene.text.TextAlignment;
|
||||||
|
|
||||||
@@ -65,20 +66,24 @@ import javafx.scene.text.TextAlignment;
|
|||||||
* decoder. Processing and selected channels use their own colors. When the decoder applies a frequency correction,
|
* decoder. Processing and selected channels use their own colors. When the decoder applies a frequency correction,
|
||||||
* a bracket at the bottom of the box shows the corrected channel position and the PPM error.
|
* a bracket at the bottom of the box shows the corrected channel position and the PPM error.
|
||||||
*
|
*
|
||||||
* When the zoom level is too low for a channel's labels to fit in its box, resting the mouse over the channel lists
|
* When the zoom level is too low for a channel's labels to fit in its box, moving the mouse over the channel shows a
|
||||||
* it in the Channels hover card (drawn by {@link ChannelCardLayer}) with its system, site, decoder, frequency and
|
* popout card near the bottom of the spectrum (or the waterfall) with the channel name, system, site, decoder,
|
||||||
* state. This can be turned off with the hover details setting.
|
* frequency and state. The popout can be turned off with the hover details setting.
|
||||||
*
|
*
|
||||||
* Right-clicking a channel lists it in the Channels context menu, to enable or disable it or view or edit it in the
|
* Right-clicking a channel adds a menu item to view or edit the channel in the playlist editor.
|
||||||
* playlist editor.
|
|
||||||
*/
|
*/
|
||||||
public class ChannelLayer extends SpectralDisplayLayer
|
public class ChannelLayer extends SpectralDisplayLayer
|
||||||
{
|
{
|
||||||
private static final Font FONT = Font.font(11);
|
private static final Font FONT = Font.font(11);
|
||||||
private static final DecimalFormat PPM_FORMAT = new DecimalFormat("0.0");
|
private static final DecimalFormat PPM_FORMAT = new DecimalFormat("0.0");
|
||||||
private static final DecimalFormat FREQUENCY_FORMAT = new DecimalFormat("0.00000");
|
private static final DecimalFormat FREQUENCY_FORMAT = new DecimalFormat("0.00000");
|
||||||
|
private static final Font POPOUT_TITLE_FONT = Font.font(Font.getDefault().getFamily(), FontWeight.BOLD, 11);
|
||||||
private static final double MIN_LABEL_BOX_WIDTH = 12;
|
private static final double MIN_LABEL_BOX_WIDTH = 12;
|
||||||
private static final double MIN_HIT_WIDTH = 10;
|
private static final double POPOUT_MIN_HIT_WIDTH = 10;
|
||||||
|
private static final double POPOUT_PADDING = 6;
|
||||||
|
private static final double POPOUT_GAP = 5;
|
||||||
|
private static final double POPOUT_SWATCH = 8;
|
||||||
|
private static final int POPOUT_MAX_CHANNELS = 4;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Which channels the layer shows.
|
* Which channels the layer shows.
|
||||||
@@ -377,23 +382,131 @@ public class ChannelLayer extends SpectralDisplayLayer
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
renderPopout(gc, area, DisplaySection.SPECTRUM);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void renderWaterfall(GraphicsContext gc, RenderArea area)
|
||||||
|
{
|
||||||
|
renderPopout(gc, area, DisplaySection.WATERFALL);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Card entries for the channels under the mouse. A channel whose labels don't fit in its box at the current
|
* Draws a card near the bottom of the section under the mouse with the details of each channel under the mouse
|
||||||
* zoom prompts the card. The hit area of a narrow channel is widened so it can be found with the mouse.
|
* whose labels don't fit in its box at the current zoom. The card moves to the top of the section when the mouse
|
||||||
|
* is over the bottom of the section.
|
||||||
*/
|
*/
|
||||||
@Override
|
private void renderPopout(GraphicsContext gc, RenderArea area, DisplaySection section)
|
||||||
public List<ChannelCardEntry> getCardEntries(DisplayCursor cursor, RenderArea area)
|
|
||||||
{
|
{
|
||||||
SpectralDisplayModel model = getModel();
|
SpectralDisplayModel model = getModel();
|
||||||
List<ChannelCardEntry> entries = new ArrayList<>();
|
DisplayCursor cursor = getSpectralDisplay().getDisplayCursor();
|
||||||
|
|
||||||
if(!mHoverDetails.get() || model == null || mChannelDisplay.get() == ChannelDisplay.NONE)
|
if(!mHoverDetails.get() || model == null || !model.hasSource() || cursor == null ||
|
||||||
|
cursor.section() != section || mChannelDisplay.get() == ChannelDisplay.NONE)
|
||||||
{
|
{
|
||||||
return entries;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
List<PopoutEntry> entries = getPopoutEntries(model, area, cursor.x());
|
||||||
|
|
||||||
|
if(entries.isEmpty())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
SpectralDisplayTheme theme = getSpectralDisplay().getTheme();
|
||||||
|
int shown = Math.min(entries.size(), POPOUT_MAX_CHANNELS);
|
||||||
|
String more = entries.size() > shown ? "+ " + (entries.size() - shown) + " more" : null;
|
||||||
|
|
||||||
|
//Measure the card
|
||||||
|
double textWidth = 0;
|
||||||
|
int lineCount = 0;
|
||||||
|
|
||||||
|
for(int x = 0; x < shown; x++)
|
||||||
|
{
|
||||||
|
PopoutEntry entry = entries.get(x);
|
||||||
|
textWidth = Math.max(textWidth, measure(entry.title(), POPOUT_TITLE_FONT) + POPOUT_SWATCH + 5);
|
||||||
|
|
||||||
|
for(String line: entry.details())
|
||||||
|
{
|
||||||
|
textWidth = Math.max(textWidth, measure(line, FONT));
|
||||||
|
}
|
||||||
|
|
||||||
|
lineCount += 1 + entry.details().size();
|
||||||
|
}
|
||||||
|
|
||||||
|
if(more != null)
|
||||||
|
{
|
||||||
|
textWidth = Math.max(textWidth, measure(more, FONT));
|
||||||
|
lineCount++;
|
||||||
|
}
|
||||||
|
|
||||||
|
double width = textWidth + (POPOUT_PADDING * 2);
|
||||||
|
double height = (lineCount * mTextHeight) + ((shown - 1) * POPOUT_GAP) + (POPOUT_PADDING * 2);
|
||||||
|
double bottom = section == DisplaySection.SPECTRUM ? area.plotHeight() : area.height();
|
||||||
|
double x = Math.max(4, Math.min(area.width() - width - 4, cursor.x() - (width / 2.0)));
|
||||||
|
double y = bottom - height - 6;
|
||||||
|
|
||||||
|
//Keep the card out from under the mouse
|
||||||
|
if(cursor.y() >= y - 4)
|
||||||
|
{
|
||||||
|
y = 6;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(y < 0 || width > area.width())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
gc.setFill(theme.getBackground(0.88));
|
||||||
|
gc.fillRoundRect(x, y, width, height, 8, 8);
|
||||||
|
gc.setStroke(opaque(theme.getLine()));
|
||||||
|
gc.setLineWidth(1.0);
|
||||||
|
gc.strokeRoundRect(Math.floor(x) + 0.5, Math.floor(y) + 0.5, width, height, 8, 8);
|
||||||
|
gc.setTextAlign(TextAlignment.LEFT);
|
||||||
|
gc.setTextBaseline(VPos.TOP);
|
||||||
|
|
||||||
|
double lineY = y + POPOUT_PADDING;
|
||||||
|
double textX = x + POPOUT_PADDING;
|
||||||
|
|
||||||
|
for(int index = 0; index < shown; index++)
|
||||||
|
{
|
||||||
|
PopoutEntry entry = entries.get(index);
|
||||||
|
double swatchY = lineY + ((mTextHeight - POPOUT_SWATCH) / 2.0);
|
||||||
|
gc.setFill(opaque(entry.color()));
|
||||||
|
gc.fillRect(textX, swatchY, POPOUT_SWATCH, POPOUT_SWATCH);
|
||||||
|
gc.setFill(theme.getCursor());
|
||||||
|
gc.setFont(POPOUT_TITLE_FONT);
|
||||||
|
gc.fillText(entry.title(), textX + POPOUT_SWATCH + 5, lineY);
|
||||||
|
lineY += mTextHeight;
|
||||||
|
gc.setFill(opaque(theme.getLine()));
|
||||||
|
gc.setFont(FONT);
|
||||||
|
|
||||||
|
for(String line: entry.details())
|
||||||
|
{
|
||||||
|
gc.fillText(line, textX, lineY);
|
||||||
|
lineY += mTextHeight;
|
||||||
|
}
|
||||||
|
|
||||||
|
lineY += POPOUT_GAP;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(more != null)
|
||||||
|
{
|
||||||
|
gc.fillText(more, textX, lineY - POPOUT_GAP);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Channels under the screen x position whose labels don't fit in the channel box. The hit area of a narrow
|
||||||
|
* channel is widened so it can be found with the mouse.
|
||||||
|
*/
|
||||||
|
private List<PopoutEntry> getPopoutEntries(SpectralDisplayModel model, RenderArea area, double cursorX)
|
||||||
|
{
|
||||||
|
List<PopoutEntry> entries = new ArrayList<>();
|
||||||
|
SpectralDisplayTheme theme = getSpectralDisplay().getTheme();
|
||||||
|
|
||||||
for(Channel channel: getChannels(model))
|
for(Channel channel: getChannels(model))
|
||||||
{
|
{
|
||||||
if(!isShown(channel))
|
if(!isShown(channel))
|
||||||
@@ -410,14 +523,38 @@ public class ChannelLayer extends SpectralDisplayLayer
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
double hitWidth = Math.max(MIN_HIT_WIDTH, box.width());
|
double hitWidth = Math.max(POPOUT_MIN_HIT_WIDTH, box.width());
|
||||||
double hitStart = box.center() - (hitWidth / 2.0);
|
double hitStart = box.center() - (hitWidth / 2.0);
|
||||||
|
|
||||||
if(cursor.x() >= hitStart && cursor.x() <= hitStart + hitWidth)
|
if(cursorX < hitStart || cursorX > hitStart + hitWidth || labelsFit(channel, box))
|
||||||
{
|
{
|
||||||
entries.add(ChannelMenus.createCardEntry(channel, tunerChannel, !labelsFit(channel, box)));
|
continue;
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
List<String> details = new ArrayList<>();
|
||||||
|
String systemSite = join(channel.hasSystem() ? channel.getSystem() : null,
|
||||||
|
channel.hasSite() ? channel.getSite() : null);
|
||||||
|
|
||||||
|
if(systemSite != null)
|
||||||
|
{
|
||||||
|
details.add(systemSite);
|
||||||
|
}
|
||||||
|
|
||||||
|
String state = channel.isProcessing() ? "Enabled" : "Disabled";
|
||||||
|
|
||||||
|
if(channel.isSelected())
|
||||||
|
{
|
||||||
|
state += ", Selected";
|
||||||
|
}
|
||||||
|
|
||||||
|
details.add(join(channel.getDecodeConfiguration().getDecoderType().getShortDisplayString(),
|
||||||
|
FREQUENCY_FORMAT.format(tunerChannel.getFrequency() / 1E6) + " MHz", state));
|
||||||
|
|
||||||
|
Color color = channel.isSelected() ? theme.getChannelSelected() :
|
||||||
|
channel.isProcessing() ? theme.getChannelProcessing() : theme.getChannel();
|
||||||
|
entries.add(new PopoutEntry(channel.getName() != null ? channel.getName() : "(unnamed)", details,
|
||||||
|
color));
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -586,9 +723,14 @@ public class ChannelLayer extends SpectralDisplayLayer
|
|||||||
frequency <= tunerChannel.getMaxFrequency())
|
frequency <= tunerChannel.getMaxFrequency())
|
||||||
{
|
{
|
||||||
//Traffic channels are started and stopped by their decoder, not from the playlist
|
//Traffic channels are started and stopped by their decoder, not from the playlist
|
||||||
Runnable toggle = !channel.isTrafficChannel() && mChannelProcessingManager != null ?
|
if(!channel.isTrafficChannel() && mChannelProcessingManager != null)
|
||||||
() -> toggle(channel) : null;
|
{
|
||||||
items.add(ChannelMenus.createChannelEntry(channel, tunerChannel, toggle));
|
items.add(createEnableItem(channel));
|
||||||
|
}
|
||||||
|
|
||||||
|
MenuItem item = new MenuItem("View/Edit: " + channel.getShortTitle());
|
||||||
|
item.setOnAction(e -> MyEventBus.getGlobalEventBus().post(new ViewChannelRequest(channel)));
|
||||||
|
items.add(item);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -597,20 +739,14 @@ public class ChannelLayer extends SpectralDisplayLayer
|
|||||||
return items;
|
return items;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getContextMenuSection()
|
|
||||||
{
|
|
||||||
return ChannelMenus.SECTION;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Stops the channel when it's processing, otherwise starts it
|
* Menu item that starts the channel when it's disabled, or stops it when it's enabled, in the background
|
||||||
*/
|
*/
|
||||||
private void toggle(Channel channel)
|
private MenuItem createEnableItem(Channel channel)
|
||||||
{
|
{
|
||||||
boolean processing = channel.isProcessing();
|
boolean processing = channel.isProcessing();
|
||||||
|
MenuItem item = new MenuItem((processing ? "Disable: " : "Enable: ") + channel.getShortTitle());
|
||||||
ThreadPool.CACHED.execute(() -> {
|
item.setOnAction(e -> ThreadPool.CACHED.execute(() -> {
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
if(processing)
|
if(processing)
|
||||||
@@ -626,7 +762,8 @@ public class ChannelLayer extends SpectralDisplayLayer
|
|||||||
{
|
{
|
||||||
showError((processing ? "Can't stop " : "Can't start ") + channel.getShortTitle(), ce.getMessage());
|
showError((processing ? "Can't stop " : "Can't start ") + channel.getShortTitle(), ce.getMessage());
|
||||||
}
|
}
|
||||||
});
|
}));
|
||||||
|
return item;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -655,4 +792,10 @@ public class ChannelLayer extends SpectralDisplayLayer
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Channel details for the popout card.
|
||||||
|
*/
|
||||||
|
private record PopoutEntry(String title, List<String> details, Color color)
|
||||||
|
{
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,27 +20,24 @@
|
|||||||
package io.github.dsheirer.gui.spectrum.layer;
|
package io.github.dsheirer.gui.spectrum.layer;
|
||||||
|
|
||||||
import io.github.dsheirer.controller.channel.Channel;
|
import io.github.dsheirer.controller.channel.Channel;
|
||||||
import io.github.dsheirer.eventbus.MyEventBus;
|
|
||||||
import io.github.dsheirer.gui.playlist.radioreference.ViewRadioReferenceRequest;
|
|
||||||
import io.github.dsheirer.gui.playlist.radioreference.RadioReferencePlaylistActions;
|
import io.github.dsheirer.gui.playlist.radioreference.RadioReferencePlaylistActions;
|
||||||
import io.github.dsheirer.module.decode.DecoderType;
|
import io.github.dsheirer.module.decode.DecoderType;
|
||||||
import io.github.dsheirer.service.radioreference.SiteRecord;
|
import io.github.dsheirer.service.radioreference.SiteRecord;
|
||||||
|
import io.github.dsheirer.source.tuner.channel.TunerChannel;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import javafx.application.Platform;
|
import javafx.application.Platform;
|
||||||
import javafx.scene.control.Alert;
|
import javafx.scene.control.Alert;
|
||||||
import javafx.scene.control.ButtonType;
|
import javafx.scene.control.ButtonType;
|
||||||
import javafx.scene.control.Menu;
|
|
||||||
import javafx.scene.control.MenuItem;
|
import javafx.scene.control.MenuItem;
|
||||||
import io.github.dsheirer.gui.spectrum.ChannelCardEntry;
|
|
||||||
import io.github.dsheirer.gui.spectrum.ChannelMenus;
|
|
||||||
import io.github.dsheirer.gui.spectrum.ChannelMenus.State;
|
|
||||||
import io.github.dsheirer.gui.spectrum.ConfigurationRow;
|
import io.github.dsheirer.gui.spectrum.ConfigurationRow;
|
||||||
|
import io.github.dsheirer.gui.spectrum.CursorReadout;
|
||||||
import io.github.dsheirer.gui.spectrum.DisplayCursor;
|
import io.github.dsheirer.gui.spectrum.DisplayCursor;
|
||||||
import io.github.dsheirer.gui.spectrum.DisplaySection;
|
import io.github.dsheirer.gui.spectrum.DisplaySection;
|
||||||
import io.github.dsheirer.gui.spectrum.RenderArea;
|
import io.github.dsheirer.gui.spectrum.RenderArea;
|
||||||
import io.github.dsheirer.gui.spectrum.SpectralDisplayLayer;
|
import io.github.dsheirer.gui.spectrum.SpectralDisplayLayer;
|
||||||
import io.github.dsheirer.gui.spectrum.SpectralDisplayModel;
|
import io.github.dsheirer.gui.spectrum.SpectralDisplayModel;
|
||||||
|
import io.github.dsheirer.gui.spectrum.SpectralDisplayTheme;
|
||||||
import io.github.dsheirer.service.radioreference.DistanceFormat;
|
import io.github.dsheirer.service.radioreference.DistanceFormat;
|
||||||
import io.github.dsheirer.service.radioreference.FrequencyCandidate;
|
import io.github.dsheirer.service.radioreference.FrequencyCandidate;
|
||||||
import io.github.dsheirer.service.radioreference.RadioReferenceFrequencyIndex;
|
import io.github.dsheirer.service.radioreference.RadioReferenceFrequencyIndex;
|
||||||
@@ -48,37 +45,76 @@ import io.github.dsheirer.service.radioreference.RadioReferenceFrequencyIndex.Ra
|
|||||||
import java.text.DecimalFormat;
|
import java.text.DecimalFormat;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.Comparator;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import javafx.animation.PauseTransition;
|
||||||
import javafx.beans.property.BooleanProperty;
|
import javafx.beans.property.BooleanProperty;
|
||||||
import javafx.beans.property.SimpleBooleanProperty;
|
import javafx.beans.property.SimpleBooleanProperty;
|
||||||
|
import javafx.geometry.VPos;
|
||||||
|
import javafx.scene.canvas.GraphicsContext;
|
||||||
import javafx.scene.control.Label;
|
import javafx.scene.control.Label;
|
||||||
import javafx.scene.control.Tooltip;
|
import javafx.scene.control.Tooltip;
|
||||||
|
import javafx.scene.paint.Color;
|
||||||
|
import javafx.scene.text.Font;
|
||||||
|
import javafx.scene.text.FontWeight;
|
||||||
|
import javafx.scene.text.Text;
|
||||||
|
import javafx.scene.text.TextAlignment;
|
||||||
|
import javafx.util.Duration;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Radio reference candidates layer. Lists the radio reference frequencies near the frequency under the mouse,
|
* Radio reference candidates layer. When the mouse rests over the spectrum or the waterfall, shows a card next to the
|
||||||
* nearest to the user's location first, in the Channels hover card (drawn by {@link ChannelCardLayer}) and the
|
* mouse with the radio reference frequencies near the frequency under the mouse, nearest to the user's location first.
|
||||||
* Channels context menu. A candidate that a playlist channel already decodes is listed as that channel.
|
|
||||||
*
|
*
|
||||||
* The candidates come from the radio reference frequency index, which needs a premium account and the user's location.
|
* The candidates come from the radio reference frequency index, which needs a premium account and the user's location.
|
||||||
* Looking up a frequency doesn't call the web service.
|
* Looking up a frequency doesn't call the web service.
|
||||||
*/
|
*/
|
||||||
public class RadioReferenceLayer extends SpectralDisplayLayer
|
public class RadioReferenceLayer extends SpectralDisplayLayer
|
||||||
{
|
{
|
||||||
|
private static final Duration HOVER_DELAY = Duration.millis(400);
|
||||||
|
private static final Font FONT = Font.font(11);
|
||||||
|
private static final Font TITLE_FONT = Font.font(Font.getDefault().getFamily(), FontWeight.BOLD, 11);
|
||||||
private static final DecimalFormat FREQUENCY_FORMAT = new DecimalFormat("0.00000");
|
private static final DecimalFormat FREQUENCY_FORMAT = new DecimalFormat("0.00000");
|
||||||
private static final long MIN_TOLERANCE_HZ = 3_000;
|
private static final long MIN_TOLERANCE_HZ = 3_000;
|
||||||
private static final double TOLERANCE_PIXELS = 3.0;
|
private static final double TOLERANCE_PIXELS = 3.0;
|
||||||
private static final int MAX_CANDIDATES = 6;
|
private static final int MAX_CANDIDATES = 6;
|
||||||
|
private static final double MAX_TEXT_WIDTH = 380;
|
||||||
|
private static final double PADDING = 6;
|
||||||
|
private static final double GAP = 5;
|
||||||
|
//Space beside the text and below the readout lines, as in the cursor readout, so the readout lines stay in place
|
||||||
|
private static final double PADDING_X = 4;
|
||||||
|
//Space kept between the card and the edges of the section
|
||||||
|
private static final double EDGE_MARGIN = 2;
|
||||||
|
private static final double READOUT_PADDING = 2;
|
||||||
|
private static final String HEADER = "Radio Reference";
|
||||||
|
|
||||||
private final RadioReferenceFrequencyIndex mIndex;
|
private final RadioReferenceFrequencyIndex mIndex;
|
||||||
private final RadioReferencePlaylistActions mActions;
|
private final RadioReferencePlaylistActions mActions;
|
||||||
private final BooleanProperty mHoverCandidates = new SimpleBooleanProperty(true);
|
private final BooleanProperty mHoverCandidates = new SimpleBooleanProperty(true);
|
||||||
|
private final Text mMeasure = new Text();
|
||||||
|
private final double mTextHeight;
|
||||||
|
private PauseTransition mHoverTimer;
|
||||||
|
private DisplaySection mHoverSection;
|
||||||
|
private double mHoverX = Double.NaN;
|
||||||
|
private double mHoverY = Double.NaN;
|
||||||
|
private boolean mHoverReady;
|
||||||
private long mResultsFrequency = Long.MIN_VALUE;
|
private long mResultsFrequency = Long.MIN_VALUE;
|
||||||
private long mResultsTolerance;
|
private long mResultsTolerance;
|
||||||
private List<RankedCandidate> mResults = Collections.emptyList();
|
private List<RankedCandidate> mResults = Collections.emptyList();
|
||||||
private List<RankedCandidate> mCardCandidates;
|
private Card mCard;
|
||||||
private List<ChannelCardEntry> mCardEntries = Collections.emptyList();
|
|
||||||
private long mCardEntriesTime;
|
/**
|
||||||
|
* Candidate text of the card, measured once per lookup
|
||||||
|
* @param entries lines of each candidate: the title, then the details
|
||||||
|
* @param more line, or null
|
||||||
|
* @param textWidth of the widest line
|
||||||
|
* @param lineCount of the header, candidate and more lines
|
||||||
|
* @param maxTextWidth that the lines were shortened to
|
||||||
|
* @param maxHeight that the card was limited to
|
||||||
|
* @param readoutLines that the card was sized for
|
||||||
|
*/
|
||||||
|
private record Card(List<List<String>> entries, String more, double textWidth, int lineCount,
|
||||||
|
double maxTextWidth, double maxHeight, int readoutLines)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructs an instance.
|
* Constructs an instance.
|
||||||
@@ -89,6 +125,9 @@ public class RadioReferenceLayer extends SpectralDisplayLayer
|
|||||||
{
|
{
|
||||||
mIndex = index;
|
mIndex = index;
|
||||||
mActions = actions;
|
mActions = actions;
|
||||||
|
mMeasure.setFont(FONT);
|
||||||
|
mMeasure.setText("Ag");
|
||||||
|
mTextHeight = Math.ceil(mMeasure.getLayoutBounds().getHeight());
|
||||||
mHoverCandidates.addListener((ob, ov, nv) -> requestRender());
|
mHoverCandidates.addListener((ob, ov, nv) -> requestRender());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -109,6 +148,15 @@ public class RadioReferenceLayer extends SpectralDisplayLayer
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void dispose()
|
||||||
|
{
|
||||||
|
if(mHoverTimer != null)
|
||||||
|
{
|
||||||
|
mHoverTimer.stop();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getConfigurationTitle()
|
public String getConfigurationTitle()
|
||||||
{
|
{
|
||||||
@@ -133,17 +181,10 @@ public class RadioReferenceLayer extends SpectralDisplayLayer
|
|||||||
return List.of(hover, new ConfigurationRow("Nearby", status));
|
return List.of(hover, new ConfigurationRow("Nearby", status));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getContextMenuSection()
|
|
||||||
{
|
|
||||||
return ChannelMenus.SECTION;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Channel entries for the candidates at the frequency, in the card's order. A candidate that a playlist channel
|
* Context menu items for the candidates at the frequency, in the card's order: add a candidate to the playlist and
|
||||||
* already decodes is listed as that playlist channel, otherwise as a candidate to add to the playlist (and
|
* start it, or enable or disable the playlist channel that already decodes it. One item per site, and per
|
||||||
* start). Both can be viewed in the playlist editor's Radio Reference tab (View in Radio Reference). One entry per site, since the site's
|
* frequency and protocol, so an item never adds a duplicate channel.
|
||||||
* frequencies share its channel. Adding never duplicates a playlist channel.
|
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public List<MenuItem> getContextMenuItems(DisplaySection section, long frequency)
|
public List<MenuItem> getContextMenuItems(DisplaySection section, long frequency)
|
||||||
@@ -178,121 +219,139 @@ public class RadioReferenceLayer extends SpectralDisplayLayer
|
|||||||
|
|
||||||
if(site != null && offered.add(key))
|
if(site != null && offered.add(key))
|
||||||
{
|
{
|
||||||
items.add(createSiteEntry(site, ranked));
|
addSiteItem(items, site, candidate, frequency);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if(offered.add("frequency:" + candidate.frequencyHz() + ":" + candidate.title() + ":" +
|
else
|
||||||
candidate.source()))
|
|
||||||
{
|
{
|
||||||
items.add(createConventionalEntry(ranked, RadioReferencePlaylistActions.getDecoderType(candidate)));
|
DecoderType decoderType = RadioReferencePlaylistActions.getDecoderType(candidate);
|
||||||
|
Set<DecoderType> family = RadioReferencePlaylistActions.getProtocolFamily(decoderType);
|
||||||
|
String protocol = family.isEmpty() ? String.valueOf(candidate.mode()) : family.iterator().next().name();
|
||||||
|
|
||||||
|
if(offered.add("frequency:" + candidate.frequencyHz() + ":" + protocol))
|
||||||
|
{
|
||||||
|
addConventionalItem(items, candidate, decoderType, frequency);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//Playlist channels first, then the candidates, each in the card's order
|
if(!items.isEmpty())
|
||||||
items.sort(Comparator.comparing(item -> item.getUserData() == null));
|
{
|
||||||
|
MenuItem header = new MenuItem("Radio Reference");
|
||||||
|
header.setDisable(true);
|
||||||
|
items.add(0, header);
|
||||||
|
}
|
||||||
|
|
||||||
return items;
|
return items;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
private void addSiteItem(List<MenuItem> items, SiteRecord site, FrequencyCandidate candidate, long frequency)
|
||||||
* Entry for a trunked system site, or for the candidate's repeater of a repeater site (LTR)
|
|
||||||
*/
|
|
||||||
private Menu createSiteEntry(SiteRecord site, RankedCandidate ranked)
|
|
||||||
{
|
{
|
||||||
FrequencyCandidate candidate = ranked.candidate();
|
String label = site.systemName() + " \u00B7 Site " + site.siteNumber() +
|
||||||
boolean repeater = RadioReferencePlaylistActions.isRepeaterSite(site);
|
|
||||||
ViewRadioReferenceRequest view = ViewRadioReferenceRequest.site(site.systemId(), site.siteId());
|
|
||||||
String unsupported = RadioReferencePlaylistActions.getUnsupportedReason(site);
|
|
||||||
Channel existing = unsupported != null ? null : repeater ? mActions.findChannel(List.of(candidate.frequencyHz()),
|
|
||||||
RadioReferencePlaylistActions.getSiteDecoderTypes(site)) : mActions.findSiteChannel(site);
|
|
||||||
|
|
||||||
if(existing != null)
|
|
||||||
{
|
|
||||||
return createPlaylistEntry(existing, view);
|
|
||||||
}
|
|
||||||
|
|
||||||
String title = site.systemName() + " \u00B7 Site " + site.siteNumber() +
|
|
||||||
(site.description() != null ? " " + site.description() : "");
|
(site.description() != null ? " " + site.description() : "");
|
||||||
|
String unsupported = RadioReferencePlaylistActions.getUnsupportedReason(site);
|
||||||
if(repeater)
|
|
||||||
{
|
|
||||||
title += site.channels().stream().filter(channel -> channel.frequencyHz() == candidate.frequencyHz() &&
|
|
||||||
channel.logicalChannelNumber() > 0).map(channel -> " LCN " + channel.logicalChannelNumber())
|
|
||||||
.findFirst().orElse("");
|
|
||||||
}
|
|
||||||
|
|
||||||
Menu menu = ChannelMenus.createEntry(title, describe(ranked), State.CANDIDATE, null);
|
|
||||||
|
|
||||||
if(unsupported != null)
|
if(unsupported != null)
|
||||||
{
|
{
|
||||||
menu.getItems().add(ChannelMenus.createNote(unsupported));
|
MenuItem item = new MenuItem(label + " \u2013 " + unsupported);
|
||||||
}
|
item.setDisable(true);
|
||||||
else if(repeater)
|
items.add(item);
|
||||||
{
|
return;
|
||||||
menu.getItems().addAll(
|
|
||||||
ChannelMenus.createItem("Add to Playlist and Start", State.CANDIDATE,
|
|
||||||
() -> mActions.addRepeater(site, candidate.frequencyHz(), true, this::showError)),
|
|
||||||
ChannelMenus.createItem("Add to Playlist", State.CANDIDATE,
|
|
||||||
() -> mActions.addRepeater(site, candidate.frequencyHz(), false, this::showError)));
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
//Start on the candidate frequency when it's a control or alternate control channel
|
|
||||||
menu.getItems().addAll(
|
|
||||||
ChannelMenus.createItem("Add to Playlist and Start", State.CANDIDATE,
|
|
||||||
() -> mActions.addSite(site, candidate.frequencyHz(), true, this::showError)),
|
|
||||||
ChannelMenus.createItem("Add to Playlist", State.CANDIDATE,
|
|
||||||
() -> mActions.addSite(site, candidate.frequencyHz(), false, this::showError)));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
addViewItem(menu, State.CANDIDATE, view);
|
if(RadioReferencePlaylistActions.isRepeaterSite(site))
|
||||||
return menu;
|
{
|
||||||
|
addRepeaterItem(items, site, candidate.frequencyHz(), label, frequency);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
Channel existing = mActions.findSiteChannel(site);
|
||||||
* Entry for a conventional frequency
|
|
||||||
*/
|
|
||||||
private Menu createConventionalEntry(RankedCandidate ranked, DecoderType decoderType)
|
|
||||||
{
|
|
||||||
FrequencyCandidate candidate = ranked.candidate();
|
|
||||||
String sourceKey = mIndex.getSourceKey(candidate);
|
|
||||||
ViewRadioReferenceRequest view = sourceKey != null ?
|
|
||||||
ViewRadioReferenceRequest.frequency(sourceKey, candidate) : null;
|
|
||||||
Channel existing = decoderType != null ? mActions.findConventionalChannel(candidate) : null;
|
|
||||||
|
|
||||||
if(existing != null)
|
if(existing != null)
|
||||||
{
|
{
|
||||||
return createPlaylistEntry(existing, view);
|
//The channel layer offers the channels at the clicked frequency
|
||||||
}
|
if(!covers(existing, frequency))
|
||||||
|
|
||||||
Menu menu = ChannelMenus.createEntry(candidate.title() != null ? candidate.title() : "(untitled)",
|
|
||||||
describe(ranked), State.CANDIDATE, null);
|
|
||||||
|
|
||||||
if(decoderType == null)
|
|
||||||
{
|
{
|
||||||
menu.getItems().add(ChannelMenus.createNote("Mode isn't supported"));
|
items.add(createEnableItem(existing));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
menu.getItems().addAll(
|
MenuItem item = new MenuItem("Add and Start: " + label);
|
||||||
ChannelMenus.createItem("Add to Playlist and Start", State.CANDIDATE,
|
//Start on the right-clicked frequency when it's a control or alternate control channel
|
||||||
() -> mActions.addConventional(candidate, true, this::showError)),
|
item.setOnAction(event -> mActions.addSite(site, candidate.frequencyHz(), this::showError));
|
||||||
ChannelMenus.createItem("Add to Playlist", State.CANDIDATE,
|
items.add(item);
|
||||||
() -> mActions.addConventional(candidate, false, this::showError)));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
addViewItem(menu, State.CANDIDATE, view);
|
|
||||||
return menu;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Entry for the playlist channel that decodes a candidate: enable or disable it, view or edit it, and view the
|
* Menu item for one repeater of a repeater site (LTR): add and start it, or enable or disable its channel
|
||||||
* candidate in the Radio Reference tab
|
|
||||||
* @param view request for the candidate, or null when its listing isn't known
|
|
||||||
*/
|
*/
|
||||||
private Menu createPlaylistEntry(Channel channel, ViewRadioReferenceRequest view)
|
private void addRepeaterItem(List<MenuItem> items, SiteRecord site, long repeaterFrequency, String label,
|
||||||
|
long frequency)
|
||||||
{
|
{
|
||||||
Runnable toggle = channel.isTrafficChannel() ? null : () -> {
|
Channel existing = mActions.findChannel(List.of(repeaterFrequency),
|
||||||
if(channel.isProcessing())
|
RadioReferencePlaylistActions.getSiteDecoderTypes(site));
|
||||||
|
|
||||||
|
if(existing != null)
|
||||||
|
{
|
||||||
|
if(!covers(existing, frequency))
|
||||||
|
{
|
||||||
|
items.add(createEnableItem(existing));
|
||||||
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
String lcn = site.channels().stream().filter(channel -> channel.frequencyHz() == repeaterFrequency &&
|
||||||
|
channel.logicalChannelNumber() > 0).map(channel -> " LCN " + channel.logicalChannelNumber())
|
||||||
|
.findFirst().orElse("");
|
||||||
|
MenuItem item = new MenuItem("Add and Start: " + label + lcn + " (" +
|
||||||
|
FREQUENCY_FORMAT.format(repeaterFrequency / 1E6) + " MHz)");
|
||||||
|
item.setOnAction(event -> mActions.addRepeater(site, repeaterFrequency, this::showError));
|
||||||
|
items.add(item);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void addConventionalItem(List<MenuItem> items, FrequencyCandidate candidate, DecoderType decoderType,
|
||||||
|
long frequency)
|
||||||
|
{
|
||||||
|
String label = candidate.title() + " (" + FREQUENCY_FORMAT.format(candidate.frequencyHz() / 1E6) + " MHz" +
|
||||||
|
(candidate.mode() != null ? " " + candidate.mode() : "") + ")";
|
||||||
|
|
||||||
|
if(decoderType == null)
|
||||||
|
{
|
||||||
|
MenuItem item = new MenuItem(label + " \u2013 mode isn't supported");
|
||||||
|
item.setDisable(true);
|
||||||
|
items.add(item);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
Channel existing = mActions.findConventionalChannel(candidate);
|
||||||
|
|
||||||
|
if(existing != null)
|
||||||
|
{
|
||||||
|
if(!covers(existing, frequency))
|
||||||
|
{
|
||||||
|
items.add(createEnableItem(existing));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
MenuItem item = new MenuItem("Add and Start: " + label);
|
||||||
|
item.setOnAction(event -> mActions.addConventional(candidate, this::showError));
|
||||||
|
items.add(item);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Menu item that enables the playlist channel when it's disabled, or disables it when it's enabled
|
||||||
|
*/
|
||||||
|
private MenuItem createEnableItem(Channel channel)
|
||||||
|
{
|
||||||
|
boolean processing = channel.isProcessing();
|
||||||
|
MenuItem item = new MenuItem((processing ? "Disable: " : "Enable: ") + channel.getShortTitle());
|
||||||
|
item.setOnAction(event -> {
|
||||||
|
if(processing)
|
||||||
{
|
{
|
||||||
mActions.disable(channel, this::showError);
|
mActions.disable(channel, this::showError);
|
||||||
}
|
}
|
||||||
@@ -300,22 +359,25 @@ public class RadioReferenceLayer extends SpectralDisplayLayer
|
|||||||
{
|
{
|
||||||
mActions.enable(channel, this::showError);
|
mActions.enable(channel, this::showError);
|
||||||
}
|
}
|
||||||
};
|
});
|
||||||
Menu menu = ChannelMenus.createChannelEntry(channel, null, toggle);
|
return item;
|
||||||
addViewItem(menu, channel.isProcessing() ? State.ENABLED : State.DISABLED, view);
|
|
||||||
return menu;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Adds the item that shows the candidate in the playlist editor's Radio Reference tab
|
* Indicates if one of the channel's tuner channels includes the frequency
|
||||||
* @param request to show the candidate, or null when the candidate's listing isn't known
|
|
||||||
*/
|
*/
|
||||||
private static void addViewItem(Menu menu, State state, ViewRadioReferenceRequest request)
|
private static boolean covers(Channel channel, long frequency)
|
||||||
{
|
{
|
||||||
MenuItem view = ChannelMenus.createItem("View in Radio Reference", state,
|
for(TunerChannel tunerChannel: channel.getTunerChannels())
|
||||||
() -> MyEventBus.getGlobalEventBus().post(request));
|
{
|
||||||
view.setDisable(request == null);
|
if(tunerChannel != null && tunerChannel.getMinFrequency() <= frequency &&
|
||||||
menu.getItems().addAll(ChannelMenus.createSeparator(), view);
|
frequency <= tunerChannel.getMaxFrequency())
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -337,88 +399,49 @@ public class RadioReferenceLayer extends SpectralDisplayLayer
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void renderSpectrumForeground(GraphicsContext gc, RenderArea area)
|
||||||
|
{
|
||||||
|
render(gc, area, DisplaySection.SPECTRUM);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void renderWaterfall(GraphicsContext gc, RenderArea area)
|
||||||
|
{
|
||||||
|
render(gc, area, DisplaySection.WATERFALL);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Card entries for the candidates at the mouse position, in the card's order. A candidate that a playlist
|
* Draws the card in the section under the mouse once the mouse has rested for the hover delay
|
||||||
* channel already decodes is listed as that playlist channel.
|
*/
|
||||||
|
private void render(GraphicsContext gc, RenderArea area, DisplaySection section)
|
||||||
|
{
|
||||||
|
DisplayCursor cursor = getSpectralDisplay() != null ? getSpectralDisplay().getDisplayCursor() : null;
|
||||||
|
trackHover(cursor);
|
||||||
|
|
||||||
|
if(cursor != null && cursor.section() == section && replacesCursorReadout(cursor, area))
|
||||||
|
{
|
||||||
|
drawCard(gc, area, cursor, getCandidates(cursor.frequency(), getTolerance(getModel(), area)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The card replaces the cursor readout while it's shown: it ends with the readout lines, in the readout's place.
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public List<ChannelCardEntry> getCardEntries(DisplayCursor cursor, RenderArea area)
|
public boolean replacesCursorReadout(DisplayCursor cursor, RenderArea area)
|
||||||
{
|
{
|
||||||
SpectralDisplayModel model = getModel();
|
SpectralDisplayModel model = getModel();
|
||||||
|
|
||||||
if(mIndex == null || !mHoverCandidates.get() || model == null || area.width() <= 0)
|
//Only for the position the mouse rested at - the readout comes back as soon as the mouse moves
|
||||||
|
if(mIndex == null || !mHoverCandidates.get() || !mHoverReady || model == null || !model.hasSource() ||
|
||||||
|
cursor == null || cursor.section() != mHoverSection || cursor.x() != mHoverX || cursor.y() != mHoverY ||
|
||||||
|
area.width() <= 0)
|
||||||
{
|
{
|
||||||
return Collections.emptyList();
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
List<RankedCandidate> candidates = getCandidates(cursor.frequency(), getTolerance(model, area));
|
return !getCandidates(cursor.frequency(), getTolerance(model, area)).isEmpty();
|
||||||
|
|
||||||
//The playlist channels of the candidates, looked up once per lookup or second, since that copies the playlist
|
|
||||||
if(candidates != mCardCandidates || System.currentTimeMillis() - mCardEntriesTime > 1000)
|
|
||||||
{
|
|
||||||
mCardCandidates = candidates;
|
|
||||||
mCardEntriesTime = System.currentTimeMillis();
|
|
||||||
mCardEntries = createCardEntries(candidates);
|
|
||||||
}
|
|
||||||
|
|
||||||
return mCardEntries;
|
|
||||||
}
|
|
||||||
|
|
||||||
private List<ChannelCardEntry> createCardEntries(List<RankedCandidate> candidates)
|
|
||||||
{
|
|
||||||
List<ChannelCardEntry> entries = new ArrayList<>();
|
|
||||||
Set<String> listed = new HashSet<>();
|
|
||||||
|
|
||||||
for(RankedCandidate ranked: candidates)
|
|
||||||
{
|
|
||||||
FrequencyCandidate candidate = ranked.candidate();
|
|
||||||
Channel existing = mActions != null ? findChannel(candidate) : null;
|
|
||||||
|
|
||||||
if(existing != null)
|
|
||||||
{
|
|
||||||
entries.add(ChannelMenus.createCardEntry(existing, null, true));
|
|
||||||
}
|
|
||||||
//The same listing in several places (e.g. a county and its agency) is shown once
|
|
||||||
else if(listed.add(candidate.frequencyHz() + "|" + candidate.title() + "|" + candidate.source()))
|
|
||||||
{
|
|
||||||
List<String> details = new ArrayList<>();
|
|
||||||
details.add(describe(ranked));
|
|
||||||
String source = source(candidate);
|
|
||||||
|
|
||||||
if(source != null)
|
|
||||||
{
|
|
||||||
details.add(source);
|
|
||||||
}
|
|
||||||
|
|
||||||
String title = candidate.title() != null ? candidate.title() : "(untitled)";
|
|
||||||
entries.add(new ChannelCardEntry(title, details, State.CANDIDATE, null, true));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return entries;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Playlist channel that decodes the candidate, or null
|
|
||||||
*/
|
|
||||||
private Channel findChannel(FrequencyCandidate candidate)
|
|
||||||
{
|
|
||||||
if(candidate.isSiteFrequency())
|
|
||||||
{
|
|
||||||
SiteRecord site = mIndex.getSite(candidate.systemId(), candidate.siteId());
|
|
||||||
|
|
||||||
if(site == null || RadioReferencePlaylistActions.getUnsupportedReason(site) != null)
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
return RadioReferencePlaylistActions.isRepeaterSite(site) ?
|
|
||||||
mActions.findChannel(List.of(candidate.frequencyHz()),
|
|
||||||
RadioReferencePlaylistActions.getSiteDecoderTypes(site)) : mActions.findSiteChannel(site);
|
|
||||||
}
|
|
||||||
|
|
||||||
return RadioReferencePlaylistActions.getDecoderType(candidate) != null ?
|
|
||||||
mActions.findConventionalChannel(candidate) : null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -430,6 +453,47 @@ public class RadioReferenceLayer extends SpectralDisplayLayer
|
|||||||
return Math.max(MIN_TOLERANCE_HZ, Math.round(Math.max(TOLERANCE_PIXELS * hertzPerPixel, model.getBinWidth())));
|
return Math.max(MIN_TOLERANCE_HZ, Math.round(Math.max(TOLERANCE_PIXELS * hertzPerPixel, model.getBinWidth())));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Restarts the hover delay each time the mouse moves, and hides the card until it passes
|
||||||
|
*/
|
||||||
|
private void trackHover(DisplayCursor cursor)
|
||||||
|
{
|
||||||
|
if(cursor == null)
|
||||||
|
{
|
||||||
|
if(mHoverSection != null)
|
||||||
|
{
|
||||||
|
mHoverSection = null;
|
||||||
|
mHoverReady = false;
|
||||||
|
getHoverTimer().stop();
|
||||||
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(cursor.section() != mHoverSection || cursor.x() != mHoverX || cursor.y() != mHoverY)
|
||||||
|
{
|
||||||
|
mHoverSection = cursor.section();
|
||||||
|
mHoverX = cursor.x();
|
||||||
|
mHoverY = cursor.y();
|
||||||
|
mHoverReady = false;
|
||||||
|
getHoverTimer().playFromStart();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private PauseTransition getHoverTimer()
|
||||||
|
{
|
||||||
|
if(mHoverTimer == null)
|
||||||
|
{
|
||||||
|
mHoverTimer = new PauseTransition(HOVER_DELAY);
|
||||||
|
mHoverTimer.setOnFinished(event -> {
|
||||||
|
mHoverReady = true;
|
||||||
|
requestRender();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return mHoverTimer;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Candidates for the frequency, looked up again only when the frequency or the tolerance changes
|
* Candidates for the frequency, looked up again only when the frequency or the tolerance changes
|
||||||
*/
|
*/
|
||||||
@@ -440,11 +504,172 @@ public class RadioReferenceLayer extends SpectralDisplayLayer
|
|||||||
mResults = mIndex.lookup(frequency, tolerance);
|
mResults = mIndex.lookup(frequency, tolerance);
|
||||||
mResultsFrequency = frequency;
|
mResultsFrequency = frequency;
|
||||||
mResultsTolerance = tolerance;
|
mResultsTolerance = tolerance;
|
||||||
|
mCard = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
return mResults;
|
return mResults;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Draws the card in place of the cursor readout: beside the mouse and above it, placed like the readout, with the
|
||||||
|
* candidates above the readout lines so the frequency and level stay where the readout showed them. The card
|
||||||
|
* fits the larger side of the mouse and the height of the section, showing as many candidates as fit.
|
||||||
|
*/
|
||||||
|
private void drawCard(GraphicsContext gc, RenderArea area, DisplayCursor cursor, List<RankedCandidate> candidates)
|
||||||
|
{
|
||||||
|
//The level line changes with the mouse height while the candidates don't
|
||||||
|
List<String> readout = CursorReadout.lines(cursor, area, getModel());
|
||||||
|
double readoutWidth = 0;
|
||||||
|
|
||||||
|
for(String line: readout)
|
||||||
|
{
|
||||||
|
readoutWidth = Math.max(readoutWidth, measure(line, FONT));
|
||||||
|
}
|
||||||
|
|
||||||
|
double room = Math.max(area.width() - cursor.x(), cursor.x()) - CursorReadout.GAP_X - EDGE_MARGIN;
|
||||||
|
double maxTextWidth = Math.max(readoutWidth, Math.min(MAX_TEXT_WIDTH, room - (PADDING_X * 2)));
|
||||||
|
//Above the mouse, so the readout lines stay where the readout showed them, when a candidate fits there
|
||||||
|
double above = cursor.y() - CursorReadout.GAP_Y;
|
||||||
|
double maxHeight = above >= cardHeight(5, 1, true, readout.size()) ? above : area.plotHeight() - EDGE_MARGIN;
|
||||||
|
|
||||||
|
if(mCard == null || mCard.maxTextWidth() != maxTextWidth || mCard.maxHeight() != maxHeight ||
|
||||||
|
mCard.readoutLines() != readout.size())
|
||||||
|
{
|
||||||
|
mCard = createCard(candidates, maxTextWidth, maxHeight, readout.size());
|
||||||
|
}
|
||||||
|
|
||||||
|
Card card = mCard;
|
||||||
|
SpectralDisplayTheme theme = getSpectralDisplay().getTheme();
|
||||||
|
double width = Math.max(card.textWidth(), readoutWidth) + (PADDING_X * 2);
|
||||||
|
double height = cardHeight(card.lineCount(), card.entries().size(), card.more() != null, readout.size());
|
||||||
|
double x = Math.max(0, CursorReadout.x(cursor, width, area));
|
||||||
|
double y = CursorReadout.y(cursor, height, area);
|
||||||
|
|
||||||
|
gc.setFill(theme.getBackground(0.92));
|
||||||
|
gc.fillRoundRect(x, y, width, height, 8, 8);
|
||||||
|
gc.setStroke(opaque(theme.getLine()));
|
||||||
|
gc.setLineWidth(1.0);
|
||||||
|
gc.strokeRoundRect(Math.floor(x) + 0.5, Math.floor(y) + 0.5, width, height, 8, 8);
|
||||||
|
gc.setTextAlign(TextAlignment.LEFT);
|
||||||
|
gc.setTextBaseline(VPos.TOP);
|
||||||
|
|
||||||
|
double textX = x + PADDING_X;
|
||||||
|
double lineY = y + PADDING;
|
||||||
|
gc.setFill(theme.getCursor());
|
||||||
|
gc.setFont(TITLE_FONT);
|
||||||
|
gc.fillText(HEADER, textX, lineY);
|
||||||
|
lineY += mTextHeight + GAP;
|
||||||
|
|
||||||
|
for(List<String> lines: card.entries())
|
||||||
|
{
|
||||||
|
gc.setFill(theme.getCursor());
|
||||||
|
gc.setFont(TITLE_FONT);
|
||||||
|
gc.fillText(lines.get(0), textX, lineY);
|
||||||
|
lineY += mTextHeight;
|
||||||
|
gc.setFill(opaque(theme.getLine()));
|
||||||
|
gc.setFont(FONT);
|
||||||
|
|
||||||
|
for(int line = 1; line < lines.size(); line++)
|
||||||
|
{
|
||||||
|
gc.fillText(lines.get(line), textX, lineY);
|
||||||
|
lineY += mTextHeight;
|
||||||
|
}
|
||||||
|
|
||||||
|
lineY += GAP;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(card.more() != null)
|
||||||
|
{
|
||||||
|
gc.setFill(opaque(theme.getLine()));
|
||||||
|
gc.setFont(FONT);
|
||||||
|
gc.fillText(card.more(), textX, lineY);
|
||||||
|
lineY += mTextHeight + GAP;
|
||||||
|
}
|
||||||
|
|
||||||
|
//The readout lines, separated from the candidates, in the readout's style
|
||||||
|
double separator = Math.floor(lineY - (GAP / 2.0)) + 0.5;
|
||||||
|
gc.setStroke(theme.getLine(0.5));
|
||||||
|
gc.strokeLine(textX, separator, x + width - PADDING_X, separator);
|
||||||
|
gc.setFill(theme.getCursor());
|
||||||
|
gc.setFont(FONT);
|
||||||
|
|
||||||
|
for(String line: readout)
|
||||||
|
{
|
||||||
|
gc.fillText(line, textX, lineY);
|
||||||
|
lineY += mTextHeight;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Height of a card with the lines
|
||||||
|
* @param lineCount of the header, candidate and more lines
|
||||||
|
* @param entries number of candidates
|
||||||
|
* @param more true when the card has a more line
|
||||||
|
* @param readoutLines number of readout lines
|
||||||
|
*/
|
||||||
|
private double cardHeight(int lineCount, int entries, boolean more, int readoutLines)
|
||||||
|
{
|
||||||
|
int gaps = 1 + entries + (more ? 1 : 0);
|
||||||
|
return ((lineCount + readoutLines) * mTextHeight) + (gaps * GAP) + PADDING + READOUT_PADDING;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Card text for as many candidates as fit the height: each candidate's title, details and source, shortened to
|
||||||
|
* the width
|
||||||
|
*/
|
||||||
|
private Card createCard(List<RankedCandidate> candidates, double maxTextWidth, double maxHeight,
|
||||||
|
int readoutLines)
|
||||||
|
{
|
||||||
|
int limit = Math.min(candidates.size(), MAX_CANDIDATES);
|
||||||
|
List<List<String>> entries = new ArrayList<>();
|
||||||
|
double textWidth = measure(HEADER, TITLE_FONT);
|
||||||
|
int lineCount = 1;
|
||||||
|
|
||||||
|
for(int index = 0; index < limit; index++)
|
||||||
|
{
|
||||||
|
RankedCandidate candidate = candidates.get(index);
|
||||||
|
List<String> lines = new ArrayList<>();
|
||||||
|
String title = candidate.candidate().title() != null ? candidate.candidate().title() : "(untitled)";
|
||||||
|
lines.add(fit(title, TITLE_FONT, maxTextWidth));
|
||||||
|
lines.add(fit(describe(candidate), FONT, maxTextWidth));
|
||||||
|
String source = source(candidate.candidate());
|
||||||
|
|
||||||
|
if(source != null)
|
||||||
|
{
|
||||||
|
lines.add(fit(source, FONT, maxTextWidth));
|
||||||
|
}
|
||||||
|
|
||||||
|
//Keep room for the more line when candidates are left out
|
||||||
|
boolean more = index + 1 < candidates.size();
|
||||||
|
|
||||||
|
if(!entries.isEmpty() && cardHeight(lineCount + lines.size() + (more ? 1 : 0), entries.size() + 1, more,
|
||||||
|
readoutLines) > maxHeight)
|
||||||
|
{
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
textWidth = Math.max(textWidth, measure(lines.get(0), TITLE_FONT));
|
||||||
|
|
||||||
|
for(int line = 1; line < lines.size(); line++)
|
||||||
|
{
|
||||||
|
textWidth = Math.max(textWidth, measure(lines.get(line), FONT));
|
||||||
|
}
|
||||||
|
|
||||||
|
lineCount += lines.size();
|
||||||
|
entries.add(lines);
|
||||||
|
}
|
||||||
|
|
||||||
|
String more = candidates.size() > entries.size() ? "+ " + (candidates.size() - entries.size()) + " more" : null;
|
||||||
|
|
||||||
|
if(more != null)
|
||||||
|
{
|
||||||
|
textWidth = Math.max(textWidth, measure(more, FONT));
|
||||||
|
lineCount++;
|
||||||
|
}
|
||||||
|
|
||||||
|
return new Card(entries, more, textWidth, lineCount, maxTextWidth, maxHeight, readoutLines);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Frequency, mode or use, tone, encryption and distance of the candidate
|
* Frequency, mode or use, tone, encryption and distance of the candidate
|
||||||
*/
|
*/
|
||||||
@@ -466,6 +691,35 @@ public class RadioReferenceLayer extends SpectralDisplayLayer
|
|||||||
return join(alphaTag, candidate.source());
|
return join(alphaTag, candidate.source());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Text shortened with an ellipsis to fit the width
|
||||||
|
*/
|
||||||
|
private String fit(String text, Font font, double maxWidth)
|
||||||
|
{
|
||||||
|
if(measure(text, font) <= maxWidth)
|
||||||
|
{
|
||||||
|
return text;
|
||||||
|
}
|
||||||
|
|
||||||
|
int length = text.length();
|
||||||
|
|
||||||
|
while(length > 1 && measure(text.substring(0, length) + "…", font) > maxWidth)
|
||||||
|
{
|
||||||
|
length--;
|
||||||
|
}
|
||||||
|
|
||||||
|
return text.substring(0, length) + "…";
|
||||||
|
}
|
||||||
|
|
||||||
|
private double measure(String text, Font font)
|
||||||
|
{
|
||||||
|
mMeasure.setFont(font);
|
||||||
|
mMeasure.setText(text);
|
||||||
|
double width = mMeasure.getLayoutBounds().getWidth();
|
||||||
|
mMeasure.setFont(FONT);
|
||||||
|
return width;
|
||||||
|
}
|
||||||
|
|
||||||
private static String join(String... values)
|
private static String join(String... values)
|
||||||
{
|
{
|
||||||
StringBuilder sb = new StringBuilder();
|
StringBuilder sb = new StringBuilder();
|
||||||
@@ -485,4 +739,9 @@ public class RadioReferenceLayer extends SpectralDisplayLayer
|
|||||||
|
|
||||||
return sb.isEmpty() ? null : sb.toString();
|
return sb.isEmpty() ? null : sb.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static Color opaque(Color color)
|
||||||
|
{
|
||||||
|
return Color.color(color.getRed(), color.getGreen(), color.getBlue());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -57,7 +57,6 @@ public class TableColumnMonitor<S>
|
|||||||
public static final String LEGACY_INDEX = "column.legacy.index";
|
public static final String LEGACY_INDEX = "column.legacy.index";
|
||||||
private static final String ORDER = ".column.order";
|
private static final String ORDER = ".column.order";
|
||||||
private static final String HIDDEN = ".column.hidden";
|
private static final String HIDDEN = ".column.hidden";
|
||||||
private static final String KNOWN = ".column.known";
|
|
||||||
private static final String WIDTH = ".column.width.";
|
private static final String WIDTH = ".column.width.";
|
||||||
private static final String SEPARATOR = ",";
|
private static final String SEPARATOR = ",";
|
||||||
|
|
||||||
@@ -231,7 +230,6 @@ public class TableColumnMonitor<S>
|
|||||||
|
|
||||||
mPreferences.remove(mKey + ORDER);
|
mPreferences.remove(mKey + ORDER);
|
||||||
mPreferences.remove(mKey + HIDDEN);
|
mPreferences.remove(mKey + HIDDEN);
|
||||||
mPreferences.remove(mKey + KNOWN);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -330,13 +328,10 @@ public class TableColumnMonitor<S>
|
|||||||
if(hidden != null)
|
if(hidden != null)
|
||||||
{
|
{
|
||||||
Set<String> hiddenIds = Set.of(hidden.isEmpty() ? new String[0] : hidden.split(SEPARATOR));
|
Set<String> hiddenIds = Set.of(hidden.isEmpty() ? new String[0] : hidden.split(SEPARATOR));
|
||||||
Set<String> knownIds = getKnownIds();
|
|
||||||
|
|
||||||
for(TableColumn<S,?> column: mDefaultOrder)
|
for(TableColumn<S,?> column: mDefaultOrder)
|
||||||
{
|
{
|
||||||
//Columns that weren't in the table when the visibility was stored are new, so use the default
|
column.setVisible(!hiddenIds.contains(column.getId()));
|
||||||
column.setVisible(knownIds.contains(column.getId()) ? !hiddenIds.contains(column.getId()) :
|
|
||||||
mDefaultVisibility.get(column));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if(getVisibleColumnCount() == 0)
|
if(getVisibleColumnCount() == 0)
|
||||||
@@ -380,32 +375,6 @@ public class TableColumnMonitor<S>
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* IDs of the columns that were in the table when the visibility was stored. Settings stored before the known
|
|
||||||
* columns were stored only had columns that are shown by default.
|
|
||||||
*/
|
|
||||||
private Set<String> getKnownIds()
|
|
||||||
{
|
|
||||||
String known = mPreferences.get(mKey + KNOWN, null);
|
|
||||||
|
|
||||||
if(known != null)
|
|
||||||
{
|
|
||||||
return Set.of(known.isEmpty() ? new String[0] : known.split(SEPARATOR));
|
|
||||||
}
|
|
||||||
|
|
||||||
Set<String> ids = new HashSet<>();
|
|
||||||
|
|
||||||
for(TableColumn<S,?> column: mDefaultOrder)
|
|
||||||
{
|
|
||||||
if(mDefaultVisibility.get(column))
|
|
||||||
{
|
|
||||||
ids.add(column.getId());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return ids;
|
|
||||||
}
|
|
||||||
|
|
||||||
private int getVisibleColumnCount()
|
private int getVisibleColumnCount()
|
||||||
{
|
{
|
||||||
int count = 0;
|
int count = 0;
|
||||||
@@ -436,12 +405,9 @@ public class TableColumnMonitor<S>
|
|||||||
private void storeVisibility()
|
private void storeVisibility()
|
||||||
{
|
{
|
||||||
List<String> ids = new ArrayList<>();
|
List<String> ids = new ArrayList<>();
|
||||||
List<String> known = new ArrayList<>();
|
|
||||||
|
|
||||||
for(TableColumn<S,?> column: mDefaultOrder)
|
for(TableColumn<S,?> column: mDefaultOrder)
|
||||||
{
|
{
|
||||||
known.add(column.getId());
|
|
||||||
|
|
||||||
if(!column.isVisible())
|
if(!column.isVisible())
|
||||||
{
|
{
|
||||||
ids.add(column.getId());
|
ids.add(column.getId());
|
||||||
@@ -449,7 +415,6 @@ public class TableColumnMonitor<S>
|
|||||||
}
|
}
|
||||||
|
|
||||||
mPreferences.put(mKey + HIDDEN, String.join(SEPARATOR, ids));
|
mPreferences.put(mKey + HIDDEN, String.join(SEPARATOR, ids));
|
||||||
mPreferences.put(mKey + KNOWN, String.join(SEPARATOR, known));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private String getWidthKey(TableColumn<S,?> column)
|
private String getWidthKey(TableColumn<S,?> column)
|
||||||
|
|||||||
@@ -502,10 +502,10 @@ public class ThemeManager
|
|||||||
.append("-fx-background-color: ").append(accent).append(";")
|
.append("-fx-background-color: ").append(accent).append(";")
|
||||||
.append("}");
|
.append("}");
|
||||||
|
|
||||||
//Base64-encode the body. Don't use URLEncoder: it is form encoding and turns spaces
|
//URL-encode the body; java.net.URLEncoder is fine for our restricted charset.
|
||||||
//into '+', which a data URL doesn't decode, so JavaFX silently drops the whole sheet.
|
String encoded = java.net.URLEncoder.encode(css.toString(),
|
||||||
return "data:text/css;base64," + java.util.Base64.getEncoder().encodeToString(
|
java.nio.charset.StandardCharsets.UTF_8);
|
||||||
css.toString().getBytes(java.nio.charset.StandardCharsets.UTF_8));
|
return "data:text/css," + encoded;
|
||||||
}
|
}
|
||||||
catch(Throwable t)
|
catch(Throwable t)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -31,7 +31,6 @@ import java.util.Collections;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
import java.util.function.BiConsumer;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Talker alias cache manager. Collects observed talker aliases and inserts them into an identifier collection when
|
* Talker alias cache manager. Collects observed talker aliases and inserts them into an identifier collection when
|
||||||
@@ -42,7 +41,6 @@ import java.util.function.BiConsumer;
|
|||||||
public class TalkerAliasManager
|
public class TalkerAliasManager
|
||||||
{
|
{
|
||||||
private Map<Integer,TalkerAliasIdentifier> mAliasMap = new ConcurrentHashMap<>();
|
private Map<Integer,TalkerAliasIdentifier> mAliasMap = new ConcurrentHashMap<>();
|
||||||
private volatile BiConsumer<RadioIdentifier,TalkerAliasIdentifier> mTalkerAliasListener;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructs an instance
|
* Constructs an instance
|
||||||
@@ -51,16 +49,6 @@ public class TalkerAliasManager
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets an optional listener to receive each talker alias that is assigned to a radio, e.g. to automatically add
|
|
||||||
* talker aliases to an alias list. The listener is invoked on the calling decoder thread.
|
|
||||||
* @param listener to receive radio and talker alias updates, or null to clear the listener.
|
|
||||||
*/
|
|
||||||
public void setTalkerAliasListener(BiConsumer<RadioIdentifier,TalkerAliasIdentifier> listener)
|
|
||||||
{
|
|
||||||
mTalkerAliasListener = listener;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Updates the alias for the radio identifier
|
* Updates the alias for the radio identifier
|
||||||
*
|
*
|
||||||
@@ -72,13 +60,6 @@ public class TalkerAliasManager
|
|||||||
if(identifier.getRole() == Role.FROM)
|
if(identifier.getRole() == Role.FROM)
|
||||||
{
|
{
|
||||||
mAliasMap.put(identifier.getValue(), alias);
|
mAliasMap.put(identifier.getValue(), alias);
|
||||||
|
|
||||||
BiConsumer<RadioIdentifier,TalkerAliasIdentifier> listener = mTalkerAliasListener;
|
|
||||||
|
|
||||||
if(listener != null && alias != null)
|
|
||||||
{
|
|
||||||
listener.accept(identifier, alias);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* *****************************************************************************
|
* ******************************************************************************
|
||||||
* Copyright (C) 2014-2026 Dennis Sheirer
|
* sdrtrunk
|
||||||
|
* Copyright (C) 2014-2018 Dennis Sheirer
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -14,30 +15,13 @@
|
|||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||||
* ****************************************************************************
|
* *****************************************************************************
|
||||||
*/
|
*/
|
||||||
package io.github.dsheirer.map;
|
package io.github.dsheirer.map;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Listener for changes to the plottable entities. Called on the thread that made the change: the decode event thread
|
|
||||||
* for new locations, or the thread that deleted the entities.
|
|
||||||
*/
|
|
||||||
public interface IPlottableUpdateListener
|
public interface IPlottableUpdateListener
|
||||||
{
|
{
|
||||||
/**
|
void entitiesUpdated();
|
||||||
* A new entity was added
|
void addPlottableEntity(PlottableEntityHistory entity);
|
||||||
*/
|
void removePlottableEntity(PlottableEntityHistory entity);
|
||||||
void entityAdded(PlottableEntityHistory entity);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* An existing entity received a new decode event or location
|
|
||||||
*/
|
|
||||||
void entityUpdated(PlottableEntityHistory entity);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Entities were deleted
|
|
||||||
*/
|
|
||||||
void entitiesRemoved(List<PlottableEntityHistory> entities);
|
|
||||||
}
|
}
|
||||||
|
|||||||
193
src/main/java/io/github/dsheirer/map/MapMouseListener.java
Normal file
193
src/main/java/io/github/dsheirer/map/MapMouseListener.java
Normal file
@@ -0,0 +1,193 @@
|
|||||||
|
/*******************************************************************************
|
||||||
|
* SDR Trunk
|
||||||
|
* Copyright (C) 2014 Dennis Sheirer
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||||
|
******************************************************************************/
|
||||||
|
package io.github.dsheirer.map;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.function.Consumer;
|
||||||
|
import java.util.function.Function;
|
||||||
|
import org.jdesktop.swingx.JXMapViewer;
|
||||||
|
import org.jdesktop.swingx.mapviewer.GeoPosition;
|
||||||
|
|
||||||
|
import javax.swing.*;
|
||||||
|
import javax.swing.event.MouseInputAdapter;
|
||||||
|
import java.awt.*;
|
||||||
|
import java.awt.event.ActionEvent;
|
||||||
|
import java.awt.event.ActionListener;
|
||||||
|
import java.awt.event.MouseEvent;
|
||||||
|
import java.awt.event.MouseWheelListener;
|
||||||
|
import java.awt.geom.Point2D;
|
||||||
|
|
||||||
|
public class MapMouseListener extends MouseInputAdapter implements MouseWheelListener
|
||||||
|
{
|
||||||
|
private JXMapViewer mJXMapViewer;
|
||||||
|
private Consumer<GeoPosition> mMyLocationListener;
|
||||||
|
private Function<Point,List<JMenuItem>> mMenuItemProvider;
|
||||||
|
private Point mPreviousPoint;
|
||||||
|
private Point mCurrentPoint;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructs an instance
|
||||||
|
* @param viewer map
|
||||||
|
* @param myLocationListener receives the location chosen with the 'Set My Location Here' menu item
|
||||||
|
* @param menuItemProvider of additional context menu items for the point that was right-clicked, listed first
|
||||||
|
*/
|
||||||
|
public MapMouseListener( JXMapViewer viewer, Consumer<GeoPosition> myLocationListener,
|
||||||
|
Function<Point,List<JMenuItem>> menuItemProvider )
|
||||||
|
{
|
||||||
|
mJXMapViewer = viewer;
|
||||||
|
mMyLocationListener = myLocationListener;
|
||||||
|
mMenuItemProvider = menuItemProvider;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void mouseDragged( MouseEvent event )
|
||||||
|
{
|
||||||
|
if ( !SwingUtilities.isLeftMouseButton( event ) )
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
Point current = event.getPoint();
|
||||||
|
|
||||||
|
double x = mJXMapViewer.getCenter().getX() -
|
||||||
|
( current.getX() - mPreviousPoint.getX() );
|
||||||
|
|
||||||
|
double y = mJXMapViewer.getCenter().getY() -
|
||||||
|
(current.getY() - mPreviousPoint.getY() );
|
||||||
|
|
||||||
|
if ( !mJXMapViewer.isNegativeYAllowed() )
|
||||||
|
{
|
||||||
|
if ( y < 0 )
|
||||||
|
{
|
||||||
|
y = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
int maxHeight = (int)( mJXMapViewer.getTileFactory()
|
||||||
|
.getMapSize( mJXMapViewer.getZoom() ).getHeight() *
|
||||||
|
mJXMapViewer.getTileFactory()
|
||||||
|
.getTileSize( mJXMapViewer.getZoom() ) );
|
||||||
|
|
||||||
|
if (y > maxHeight)
|
||||||
|
{
|
||||||
|
y = maxHeight;
|
||||||
|
}
|
||||||
|
|
||||||
|
mPreviousPoint = current;
|
||||||
|
|
||||||
|
mJXMapViewer.setCenter( new Point2D.Double( x, y ) );
|
||||||
|
|
||||||
|
mJXMapViewer.repaint();
|
||||||
|
|
||||||
|
/* Set cursor to dragging */
|
||||||
|
mJXMapViewer.setCursor( Cursor.getPredefinedCursor( Cursor.MOVE_CURSOR ) );
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void mouseReleased( MouseEvent event )
|
||||||
|
{
|
||||||
|
if ( !SwingUtilities.isLeftMouseButton( event ) )
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
mPreviousPoint = null;
|
||||||
|
|
||||||
|
/* Reset the curson */
|
||||||
|
mJXMapViewer.setCursor(
|
||||||
|
Cursor.getPredefinedCursor( Cursor.DEFAULT_CURSOR ) );
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void mouseEntered( MouseEvent event )
|
||||||
|
{
|
||||||
|
SwingUtilities.invokeLater( new Runnable()
|
||||||
|
{
|
||||||
|
@Override
|
||||||
|
public void run()
|
||||||
|
{
|
||||||
|
mJXMapViewer.requestFocusInWindow();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void mousePressed( MouseEvent event )
|
||||||
|
{
|
||||||
|
mCurrentPoint = event.getPoint();
|
||||||
|
mPreviousPoint = event.getPoint();
|
||||||
|
|
||||||
|
boolean left = SwingUtilities.isLeftMouseButton( event );
|
||||||
|
|
||||||
|
boolean middle = SwingUtilities.isMiddleMouseButton( event );
|
||||||
|
|
||||||
|
boolean right = SwingUtilities.isRightMouseButton( event );
|
||||||
|
|
||||||
|
boolean doubleClick = ( event.getClickCount() == 2 );
|
||||||
|
|
||||||
|
if (middle || ( left && doubleClick ) )
|
||||||
|
{
|
||||||
|
recenterMap( event );
|
||||||
|
}
|
||||||
|
else if( right )
|
||||||
|
{
|
||||||
|
JPopupMenu popup = new JPopupMenu();
|
||||||
|
|
||||||
|
if( mMenuItemProvider != null )
|
||||||
|
{
|
||||||
|
List<JMenuItem> items = mMenuItemProvider.apply( event.getPoint() );
|
||||||
|
|
||||||
|
if( items != null && !items.isEmpty() )
|
||||||
|
{
|
||||||
|
items.forEach( popup::add );
|
||||||
|
popup.addSeparator();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
JMenuItem mapViewItem = new JMenuItem( "Set My Location Here" );
|
||||||
|
mapViewItem.setToolTipText( "Sets your location, which is also used by the playlist editor's " +
|
||||||
|
"Radio Reference tab, to this point" );
|
||||||
|
mapViewItem.addActionListener( new ActionListener()
|
||||||
|
{
|
||||||
|
@Override
|
||||||
|
public void actionPerformed( ActionEvent arg0 )
|
||||||
|
{
|
||||||
|
mMyLocationListener.accept( mJXMapViewer.convertPointToGeoPosition( mCurrentPoint ) );
|
||||||
|
}
|
||||||
|
} );
|
||||||
|
popup.add( mapViewItem );
|
||||||
|
|
||||||
|
popup.show( mJXMapViewer, event.getX(), event.getY() );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void recenterMap( MouseEvent event )
|
||||||
|
{
|
||||||
|
Rectangle bounds = mJXMapViewer.getViewportBounds();
|
||||||
|
|
||||||
|
double x = bounds.getX() + event.getX();
|
||||||
|
|
||||||
|
double y = bounds.getY() + event.getY();
|
||||||
|
|
||||||
|
mJXMapViewer.setCenter( new Point2D.Double( x, y ) );
|
||||||
|
|
||||||
|
mJXMapViewer.setZoom( mJXMapViewer.getZoom() - 1 );
|
||||||
|
|
||||||
|
mJXMapViewer.repaint();
|
||||||
|
}
|
||||||
|
}
|
||||||
1062
src/main/java/io/github/dsheirer/map/MapPanel.java
Normal file
1062
src/main/java/io/github/dsheirer/map/MapPanel.java
Normal file
File diff suppressed because it is too large
Load Diff
@@ -29,7 +29,7 @@ import io.github.dsheirer.module.decode.event.PlottableDecodeEvent;
|
|||||||
public class PlottableEntityHistory
|
public class PlottableEntityHistory
|
||||||
{
|
{
|
||||||
private final TrackHistoryModel mTrackHistoryModel = new TrackHistoryModel();
|
private final TrackHistoryModel mTrackHistoryModel = new TrackHistoryModel();
|
||||||
private volatile PlottableDecodeEvent mCurrentEvent;
|
private PlottableDecodeEvent mCurrentEvent;
|
||||||
private final Identifier mIdentifier;
|
private final Identifier mIdentifier;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* *****************************************************************************
|
* *****************************************************************************
|
||||||
* Copyright (C) 2014-2026 Dennis Sheirer
|
* Copyright (C) 2014-2025 Dennis Sheirer
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -16,6 +16,7 @@
|
|||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||||
* ****************************************************************************
|
* ****************************************************************************
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package io.github.dsheirer.map;
|
package io.github.dsheirer.map;
|
||||||
|
|
||||||
import io.github.dsheirer.alias.Alias;
|
import io.github.dsheirer.alias.Alias;
|
||||||
@@ -26,24 +27,31 @@ import io.github.dsheirer.identifier.Identifier;
|
|||||||
import io.github.dsheirer.identifier.configuration.AliasListConfigurationIdentifier;
|
import io.github.dsheirer.identifier.configuration.AliasListConfigurationIdentifier;
|
||||||
import io.github.dsheirer.module.decode.event.PlottableDecodeEvent;
|
import io.github.dsheirer.module.decode.event.PlottableDecodeEvent;
|
||||||
import io.github.dsheirer.sample.Listener;
|
import io.github.dsheirer.sample.Listener;
|
||||||
|
import java.awt.EventQueue;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.concurrent.CopyOnWriteArrayList;
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
import javax.swing.table.AbstractTableModel;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Plottable entity histories, one for each FROM identifier and alias list that reported a location. Thread safe:
|
* Table model for plottable entity history elements.
|
||||||
* listeners are called on the thread that made the change, outside of the model's lock.
|
|
||||||
*/
|
*/
|
||||||
public class PlottableEntityModel implements Listener<PlottableDecodeEvent>
|
public class PlottableEntityModel extends AbstractTableModel implements Listener<PlottableDecodeEvent>
|
||||||
{
|
{
|
||||||
|
private final static Logger LOGGER = LoggerFactory.getLogger(PlottableEntityModel.class);
|
||||||
|
private static final int COLUMN_ID = 0;
|
||||||
|
private static final int COLUMN_ALIAS = 1;
|
||||||
|
private static final int COLUMN_ALIAS_LIST = 2;
|
||||||
|
private static final String[] COLUMN_NAMES = {"ID", "Alias", "List"};
|
||||||
private static final String KEY_NO_ALIAS_LIST = "(no alias list)";
|
private static final String KEY_NO_ALIAS_LIST = "(no alias list)";
|
||||||
private final Map<String,PlottableEntityHistory> mEntityHistoryMap = new HashMap<>();
|
private Map<String,PlottableEntityHistory> mEntityHistoryMap = new HashMap();
|
||||||
private final List<PlottableEntityHistory> mEntityHistories = new ArrayList<>();
|
private List<PlottableEntityHistory> mEntityHistories = new ArrayList<>();
|
||||||
private final List<IPlottableUpdateListener> mPlottableUpdateListeners = new CopyOnWriteArrayList<>();
|
private List<IPlottableUpdateListener> mPlottableUpdateListeners = new ArrayList<>();
|
||||||
private final AliasModel mAliasModel;
|
private AliasModel mAliasModel;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructs an instance
|
* Constructs an instance
|
||||||
@@ -59,144 +67,181 @@ public class PlottableEntityModel implements Listener<PlottableDecodeEvent>
|
|||||||
*/
|
*/
|
||||||
public void deleteAllTracks()
|
public void deleteAllTracks()
|
||||||
{
|
{
|
||||||
List<PlottableEntityHistory> removed;
|
EventQueue.invokeLater(() -> {
|
||||||
|
if(mEntityHistories.size() > 0)
|
||||||
synchronized(this)
|
|
||||||
{
|
{
|
||||||
removed = new ArrayList<>(mEntityHistories);
|
int firstRow = 0;
|
||||||
|
int lastRow = mEntityHistories.size() - 1;
|
||||||
mEntityHistoryMap.clear();
|
mEntityHistoryMap.clear();
|
||||||
mEntityHistories.clear();
|
mEntityHistories.clear();
|
||||||
|
fireTableRowsDeleted(firstRow, lastRow);
|
||||||
}
|
}
|
||||||
|
});
|
||||||
if(!removed.isEmpty())
|
|
||||||
{
|
|
||||||
mPlottableUpdateListeners.forEach(listener -> listener.entitiesRemoved(removed));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Deletes the tracks from the entity histories.
|
* Deletes the tracks from both the map and entity histories and fires a table model changed event.
|
||||||
* @param tracksToDelete to delete
|
* @param tracksToDelete to delete
|
||||||
*/
|
*/
|
||||||
public void delete(List<PlottableEntityHistory> tracksToDelete)
|
public void delete(List<PlottableEntityHistory> tracksToDelete)
|
||||||
{
|
{
|
||||||
List<PlottableEntityHistory> removed = new ArrayList<>();
|
EventQueue.invokeLater(() ->
|
||||||
|
|
||||||
synchronized(this)
|
|
||||||
{
|
{
|
||||||
for(PlottableEntityHistory track : tracksToDelete)
|
for(PlottableEntityHistory track : tracksToDelete)
|
||||||
{
|
{
|
||||||
if(mEntityHistories.remove(track))
|
int index = mEntityHistories.indexOf(track);
|
||||||
{
|
mEntityHistories.remove(track);
|
||||||
mEntityHistoryMap.values().removeIf(value -> value == track);
|
mEntityHistoryMap.entrySet().removeIf(entry -> entry.getValue() == track);
|
||||||
removed.add(track);
|
fireTableRowsDeleted(index, index);
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(!removed.isEmpty())
|
|
||||||
{
|
|
||||||
mPlottableUpdateListeners.forEach(listener -> listener.entitiesRemoved(removed));
|
|
||||||
}
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void receive(PlottableDecodeEvent plottableDecodeEvent)
|
public void receive(PlottableDecodeEvent plottableDecodeEvent)
|
||||||
{
|
{
|
||||||
if(!plottableDecodeEvent.isValidLocation())
|
if(plottableDecodeEvent.isValidLocation())
|
||||||
{
|
{
|
||||||
return;
|
//Add or update the event on the swing event thread
|
||||||
}
|
EventQueue.invokeLater(() -> {
|
||||||
|
|
||||||
Identifier from = plottableDecodeEvent.getIdentifierCollection().getFromIdentifier();
|
Identifier from = plottableDecodeEvent.getIdentifierCollection().getFromIdentifier();
|
||||||
|
|
||||||
if(from == null || from.getForm() == Form.LOCATION)
|
if(from != null && from.getForm() != Form.LOCATION)
|
||||||
{
|
{
|
||||||
return;
|
AliasListConfigurationIdentifier aliasList = plottableDecodeEvent.getIdentifierCollection().getAliasListConfiguration();
|
||||||
}
|
|
||||||
|
|
||||||
AliasListConfigurationIdentifier aliasList = plottableDecodeEvent.getIdentifierCollection()
|
|
||||||
.getAliasListConfiguration();
|
|
||||||
String key = (aliasList != null ? aliasList.toString() : KEY_NO_ALIAS_LIST) + from;
|
String key = (aliasList != null ? aliasList.toString() : KEY_NO_ALIAS_LIST) + from;
|
||||||
PlottableEntityHistory entityHistory;
|
|
||||||
boolean added = false;
|
|
||||||
|
|
||||||
synchronized(this)
|
PlottableEntityHistory entityHistory = mEntityHistoryMap.get(key);
|
||||||
{
|
|
||||||
entityHistory = mEntityHistoryMap.get(key);
|
|
||||||
|
|
||||||
if(entityHistory == null)
|
if(entityHistory == null)
|
||||||
{
|
{
|
||||||
entityHistory = new PlottableEntityHistory(from, plottableDecodeEvent);
|
entityHistory = new PlottableEntityHistory(from, plottableDecodeEvent);
|
||||||
mEntityHistories.add(entityHistory);
|
mEntityHistories.add(entityHistory);
|
||||||
mEntityHistoryMap.put(key, entityHistory);
|
mEntityHistoryMap.put(key, entityHistory);
|
||||||
added = true;
|
int index = mEntityHistories.indexOf(entityHistory);
|
||||||
|
fireTableRowsInserted(index, index);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
entityHistory.add(plottableDecodeEvent);
|
entityHistory.add(plottableDecodeEvent);
|
||||||
}
|
int index = mEntityHistories.indexOf(entityHistory);
|
||||||
|
fireTableRowsUpdated(index, index);
|
||||||
}
|
}
|
||||||
|
|
||||||
for(IPlottableUpdateListener listener : mPlottableUpdateListeners)
|
for(IPlottableUpdateListener listener : mPlottableUpdateListeners)
|
||||||
{
|
{
|
||||||
if(added)
|
listener.addPlottableEntity(entityHistory);
|
||||||
{
|
}
|
||||||
listener.entityAdded(entityHistory);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
listener.entityUpdated(entityHistory);
|
// LOGGER.warn("Received plottable decode event that does not contain a FROM identifier - cannot plot");
|
||||||
}
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getColumnName(int column)
|
||||||
|
{
|
||||||
|
if(0 <= column && column < COLUMN_NAMES.length)
|
||||||
|
{
|
||||||
|
return COLUMN_NAMES[column];
|
||||||
|
}
|
||||||
|
|
||||||
|
return "error!";
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getRowCount()
|
||||||
|
{
|
||||||
|
return mEntityHistories.size();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getColumnCount()
|
||||||
|
{
|
||||||
|
return COLUMN_NAMES.length;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Snapshot of all plottable entity histories, in the order they were added.
|
* Get the plottable entity history for the specified model index
|
||||||
|
* @param index in the model
|
||||||
|
* @return entity history or null.
|
||||||
*/
|
*/
|
||||||
public synchronized List<PlottableEntityHistory> getAll()
|
public PlottableEntityHistory get(int index)
|
||||||
|
{
|
||||||
|
if(index >= 0 && index < mEntityHistories.size())
|
||||||
|
{
|
||||||
|
return mEntityHistories.get(index);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get all plottable entity histories.
|
||||||
|
*/
|
||||||
|
public List<PlottableEntityHistory> getAll()
|
||||||
{
|
{
|
||||||
return new ArrayList<>(mEntityHistories);
|
return new ArrayList<>(mEntityHistories);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
@Override
|
||||||
* Aliases for the entity's identifier from the entity's alias list
|
public Object getValueAt(int rowIndex, int columnIndex)
|
||||||
* @param history of the entity
|
|
||||||
* @return aliases, or an empty list
|
|
||||||
*/
|
|
||||||
public List<Alias> getAliases(PlottableEntityHistory history)
|
|
||||||
{
|
{
|
||||||
AliasList aliasList = mAliasModel.getAliasList(history.getIdentifierCollection());
|
PlottableEntityHistory history = mEntityHistories.get(rowIndex);
|
||||||
|
|
||||||
if(aliasList != null && history.getIdentifier() != null)
|
if(history != null)
|
||||||
{
|
{
|
||||||
return aliasList.getAliases(history.getIdentifier());
|
switch(columnIndex)
|
||||||
|
{
|
||||||
|
case COLUMN_ID:
|
||||||
|
Identifier identifier = history.getIdentifier();
|
||||||
|
|
||||||
|
if(identifier != null)
|
||||||
|
{
|
||||||
|
return identifier.toString();
|
||||||
}
|
}
|
||||||
|
else
|
||||||
return Collections.emptyList();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Name of the entity's first alias, or null
|
|
||||||
*/
|
|
||||||
public String getAliasName(PlottableEntityHistory history)
|
|
||||||
{
|
{
|
||||||
List<Alias> aliases = getAliases(history);
|
return "(no ID)";
|
||||||
return aliases.isEmpty() ? null : aliases.getFirst().getName();
|
|
||||||
}
|
}
|
||||||
|
case COLUMN_ALIAS:
|
||||||
/**
|
Identifier aliasListConfig = history.getIdentifierCollection().getAliasListConfiguration();
|
||||||
* Name of the entity's alias list
|
if(aliasListConfig != null)
|
||||||
*/
|
|
||||||
public static String getAliasListName(PlottableEntityHistory history)
|
|
||||||
{
|
{
|
||||||
|
AliasList al = mAliasModel.getAliasList(aliasListConfig.toString());
|
||||||
|
|
||||||
|
if(al != null)
|
||||||
|
{
|
||||||
|
List<Alias> aliases = al.getAliases(history.getIdentifier());
|
||||||
|
|
||||||
|
if(!aliases.isEmpty())
|
||||||
|
{
|
||||||
|
return aliases.get(0).getName();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case COLUMN_ALIAS_LIST:
|
||||||
Identifier aliasList = history.getIdentifierCollection().getAliasListConfiguration();
|
Identifier aliasList = history.getIdentifierCollection().getAliasListConfiguration();
|
||||||
return aliasList != null ? aliasList.toString() : KEY_NO_ALIAS_LIST;
|
if(aliasList != null)
|
||||||
|
{
|
||||||
|
return aliasList.toString();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return "(no alias list)";
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
throw new IllegalArgumentException("Unexpected column index");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Adds a listener. New listeners don't receive the existing entities: see {@link #getAll()}.
|
|
||||||
*/
|
|
||||||
public void addListener(IPlottableUpdateListener listener)
|
public void addListener(IPlottableUpdateListener listener)
|
||||||
{
|
{
|
||||||
mPlottableUpdateListeners.add(listener);
|
mPlottableUpdateListeners.add(listener);
|
||||||
|
|||||||
139
src/main/java/io/github/dsheirer/map/PlottableEntityPainter.java
Normal file
139
src/main/java/io/github/dsheirer/map/PlottableEntityPainter.java
Normal file
@@ -0,0 +1,139 @@
|
|||||||
|
|
||||||
|
/*
|
||||||
|
* *****************************************************************************
|
||||||
|
* Copyright (C) 2014-2024 Dennis Sheirer
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||||
|
* ****************************************************************************
|
||||||
|
*/
|
||||||
|
package io.github.dsheirer.map;
|
||||||
|
|
||||||
|
import io.github.dsheirer.alias.AliasModel;
|
||||||
|
import io.github.dsheirer.icon.IconModel;
|
||||||
|
import java.awt.Graphics2D;
|
||||||
|
import java.awt.Rectangle;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Set;
|
||||||
|
import org.jdesktop.swingx.JXMapViewer;
|
||||||
|
import org.jdesktop.swingx.painter.AbstractPainter;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Paints plottable entities to the map.
|
||||||
|
*/
|
||||||
|
public class PlottableEntityPainter extends AbstractPainter<JXMapViewer>
|
||||||
|
{
|
||||||
|
private PlottableEntityRenderer mRenderer;
|
||||||
|
private Set<PlottableEntityHistory> mEntities = new HashSet<>();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructs an instance
|
||||||
|
* @param aliasModel to lookup alias for entities
|
||||||
|
* @param iconModel to lookup icon from alias.
|
||||||
|
*/
|
||||||
|
public PlottableEntityPainter(AliasModel aliasModel, IconModel iconModel)
|
||||||
|
{
|
||||||
|
mRenderer = new PlottableEntityRenderer(aliasModel, iconModel);
|
||||||
|
setAntialiasing(true);
|
||||||
|
setCacheable(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the length of the plotted history trails.
|
||||||
|
* @param length of history trails
|
||||||
|
*/
|
||||||
|
public void setTrackHistoryLength(int length)
|
||||||
|
{
|
||||||
|
mRenderer.setTrackHistoryLength(length);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Current size of the history trail length.
|
||||||
|
*/
|
||||||
|
public int getTrackHistoryLength()
|
||||||
|
{
|
||||||
|
return mRenderer.getTrackHistoryLength();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Adds an entity to the map
|
||||||
|
* @param entity to add
|
||||||
|
*/
|
||||||
|
public boolean addEntity(PlottableEntityHistory entity)
|
||||||
|
{
|
||||||
|
if(entity != null && !mEntities.contains(entity))
|
||||||
|
{
|
||||||
|
mEntities.add(entity);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Adds all entities to this painter
|
||||||
|
* @param entities to add.
|
||||||
|
*/
|
||||||
|
public boolean addAll(List<PlottableEntityHistory> entities)
|
||||||
|
{
|
||||||
|
boolean added = false;
|
||||||
|
for(PlottableEntityHistory entity : entities)
|
||||||
|
{
|
||||||
|
added |= addEntity(entity);
|
||||||
|
}
|
||||||
|
|
||||||
|
return added;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Removes an entity from the map
|
||||||
|
* @param entity to remove
|
||||||
|
*/
|
||||||
|
public void removeEntity(PlottableEntityHistory entity)
|
||||||
|
{
|
||||||
|
mEntities.remove(entity);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Clears all entities from the map.
|
||||||
|
*/
|
||||||
|
public void clearAllEntities()
|
||||||
|
{
|
||||||
|
mEntities.clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Clears teh specified entities from the map
|
||||||
|
* @param toDelete to delete
|
||||||
|
*/
|
||||||
|
public void clearEntities(List<PlottableEntityHistory> toDelete)
|
||||||
|
{
|
||||||
|
mEntities.removeAll(toDelete);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void doPaint(Graphics2D g, JXMapViewer map, int width, int height)
|
||||||
|
{
|
||||||
|
Rectangle viewportBounds = map.getViewportBounds();
|
||||||
|
|
||||||
|
g.translate(-viewportBounds.getX(), -viewportBounds.getY());
|
||||||
|
|
||||||
|
for(PlottableEntityHistory entity : mEntities)
|
||||||
|
{
|
||||||
|
mRenderer.paintPlottableEntity(g, map, entity, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
g.translate(viewportBounds.getX(), viewportBounds.getY());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,219 @@
|
|||||||
|
/*
|
||||||
|
* *****************************************************************************
|
||||||
|
* Copyright (C) 2014-2025 Dennis Sheirer
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||||
|
* ****************************************************************************
|
||||||
|
*/
|
||||||
|
package io.github.dsheirer.map;
|
||||||
|
|
||||||
|
import io.github.dsheirer.alias.Alias;
|
||||||
|
import io.github.dsheirer.alias.AliasList;
|
||||||
|
import io.github.dsheirer.alias.AliasModel;
|
||||||
|
import io.github.dsheirer.icon.IconModel;
|
||||||
|
import java.awt.BasicStroke;
|
||||||
|
import java.awt.Color;
|
||||||
|
import java.awt.Graphics2D;
|
||||||
|
import java.awt.RenderingHints;
|
||||||
|
import java.awt.geom.Point2D;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.List;
|
||||||
|
import org.jdesktop.swingx.JXMapViewer;
|
||||||
|
import org.jdesktop.swingx.mapviewer.GeoPosition;
|
||||||
|
|
||||||
|
import javax.swing.ImageIcon;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Paints a single plottable entity to the map.
|
||||||
|
*/
|
||||||
|
public class PlottableEntityRenderer
|
||||||
|
{
|
||||||
|
private AliasModel mAliasModel;
|
||||||
|
private IconModel mIconModel;
|
||||||
|
private int mTrackHistoryLength = 3;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructs an instance
|
||||||
|
* @param aliasModel for alias lookup for the entity to determine plot color and icon
|
||||||
|
* @param iconModel to retrieve icon for plotting.
|
||||||
|
*/
|
||||||
|
public PlottableEntityRenderer(AliasModel aliasModel, IconModel iconModel)
|
||||||
|
{
|
||||||
|
mAliasModel = aliasModel;
|
||||||
|
mIconModel = iconModel;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the length of the plotted history trails.
|
||||||
|
* @param length of history trails
|
||||||
|
*/
|
||||||
|
public void setTrackHistoryLength(int length)
|
||||||
|
{
|
||||||
|
mTrackHistoryLength = length;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Current size of the history trail length.
|
||||||
|
*/
|
||||||
|
public int getTrackHistoryLength()
|
||||||
|
{
|
||||||
|
return mTrackHistoryLength;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Requests the plottable entity be painted to the map viewer.
|
||||||
|
* @param g graphics
|
||||||
|
* @param viewer requesting the painting
|
||||||
|
* @param entity to be painted
|
||||||
|
* @param antiAliasing for rendering.
|
||||||
|
*/
|
||||||
|
public void paintPlottableEntity(Graphics2D g, JXMapViewer viewer, PlottableEntityHistory entity, boolean antiAliasing)
|
||||||
|
{
|
||||||
|
List<TimestampedGeoPosition> locationHistory = entity.getTrackHistoryModel().getTrackHistory();
|
||||||
|
|
||||||
|
if(!locationHistory.isEmpty() && locationHistory.getLast().isValid())
|
||||||
|
{
|
||||||
|
Graphics2D graphics = (Graphics2D)g.create();
|
||||||
|
|
||||||
|
if(antiAliasing)
|
||||||
|
{
|
||||||
|
graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
|
||||||
|
}
|
||||||
|
|
||||||
|
List<Alias> aliases = getAliases(entity);
|
||||||
|
|
||||||
|
Alias alias = aliases.isEmpty() ? null : aliases.get(0);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Use the entity's preferred color for lines and labels
|
||||||
|
*/
|
||||||
|
Color color = (alias != null ? alias.getDisplayColor() : Color.BLUE);
|
||||||
|
graphics.setColor(color);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Paint the route first, so the icon and label overlay it
|
||||||
|
*/
|
||||||
|
paintRoute(graphics, viewer, entity, color);
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Convert the lat/long geoposition to an x/y point on the viewer
|
||||||
|
*/
|
||||||
|
|
||||||
|
Point2D point = viewer.getTileFactory().geoToPixel(entity.getLatestPosition(), viewer.getZoom());
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Paint the icon at the current location
|
||||||
|
*/
|
||||||
|
ImageIcon icon = getIcon(alias);
|
||||||
|
paintIcon(graphics, point, icon);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Paint the label offset to the right of the icon
|
||||||
|
*/
|
||||||
|
String label = (alias != null ? alias.getName() : entity.getIdentifier().toString());
|
||||||
|
paintLabel(graphics, point, label, (int)(icon.getIconWidth() / 2), 0);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Cleanup
|
||||||
|
*/
|
||||||
|
graphics.dispose();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Optional alias that matches the identifier for the entity history
|
||||||
|
*/
|
||||||
|
private List<Alias> getAliases(PlottableEntityHistory entityHistory)
|
||||||
|
{
|
||||||
|
AliasList aliasList = mAliasModel.getAliasList(entityHistory.getIdentifierCollection());
|
||||||
|
|
||||||
|
if(aliasList != null)
|
||||||
|
{
|
||||||
|
return aliasList.getAliases(entityHistory.getIdentifier());
|
||||||
|
}
|
||||||
|
|
||||||
|
return Collections.EMPTY_LIST;
|
||||||
|
}
|
||||||
|
|
||||||
|
private ImageIcon getIcon(Alias alias)
|
||||||
|
{
|
||||||
|
String iconName = (alias != null ? alias.getIconName() : null);
|
||||||
|
return mIconModel.getIcon(iconName, IconModel.DEFAULT_ICON_SIZE);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void paintIcon(Graphics2D graphics, Point2D point, ImageIcon icon)
|
||||||
|
{
|
||||||
|
graphics.drawImage(icon.getImage(), (int)point.getX() - (icon.getIconWidth() / 2),
|
||||||
|
(int)point.getY() - (icon.getIconHeight() / 2), null);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void paintLabel(Graphics2D graphics, Point2D point, String label, int xOffset, int yOffset)
|
||||||
|
{
|
||||||
|
graphics.drawString(label, (int)point.getX() + xOffset, (int)point.getY() + yOffset);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Paints a two-tone route from the entity's list of plottables (locations).
|
||||||
|
* using black as a wider background route, and the entity's preferred color
|
||||||
|
* as a narrower foreground route.
|
||||||
|
*/
|
||||||
|
private void paintRoute(Graphics2D graphics, JXMapViewer viewer, PlottableEntityHistory entity, Color color)
|
||||||
|
{
|
||||||
|
List<TimestampedGeoPosition> locations = entity.getTrackHistoryModel().getTrackHistory();
|
||||||
|
|
||||||
|
if(!locations.isEmpty())
|
||||||
|
{
|
||||||
|
// Draw the route with a black background line
|
||||||
|
graphics.setColor(Color.BLACK);
|
||||||
|
graphics.setStroke(new BasicStroke(3));
|
||||||
|
|
||||||
|
drawRoute(locations, graphics, viewer);
|
||||||
|
|
||||||
|
// Draw the route again, in the entity's preferred color
|
||||||
|
graphics.setColor(color);
|
||||||
|
graphics.setStroke(new BasicStroke(1));
|
||||||
|
|
||||||
|
drawRoute(locations, graphics, viewer);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Draws a route from a list of plottables
|
||||||
|
*/
|
||||||
|
private void drawRoute(List<TimestampedGeoPosition> locations, Graphics2D g, JXMapViewer viewer)
|
||||||
|
{
|
||||||
|
Point2D previousPoint = null;
|
||||||
|
|
||||||
|
int length = Math.min(locations.size(), mTrackHistoryLength);
|
||||||
|
|
||||||
|
for(int x = 0; x < length; x++)
|
||||||
|
{
|
||||||
|
GeoPosition location = locations.get(x);
|
||||||
|
|
||||||
|
// convert geo-coordinate to world bitmap pixel
|
||||||
|
Point2D currentPoint = viewer.getTileFactory().geoToPixel(location, viewer.getZoom());
|
||||||
|
|
||||||
|
if(previousPoint != null)
|
||||||
|
{
|
||||||
|
g.drawLine((int)previousPoint.getX(), (int)previousPoint.getY(), (int)currentPoint.getX(), (int)currentPoint.getY());
|
||||||
|
}
|
||||||
|
|
||||||
|
previousPoint = currentPoint;
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
187
src/main/java/io/github/dsheirer/map/RadioReferenceSiteCard.java
Normal file
187
src/main/java/io/github/dsheirer/map/RadioReferenceSiteCard.java
Normal file
@@ -0,0 +1,187 @@
|
|||||||
|
/*
|
||||||
|
* *****************************************************************************
|
||||||
|
* Copyright (C) 2014-2026 Dennis Sheirer
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||||
|
* ****************************************************************************
|
||||||
|
*/
|
||||||
|
|
||||||
|
package io.github.dsheirer.map;
|
||||||
|
|
||||||
|
import io.github.dsheirer.preference.radioreference.RadioReferencePreference;
|
||||||
|
import io.github.dsheirer.rrapi.type.Coverage;
|
||||||
|
import io.github.dsheirer.service.radioreference.DistanceFormat;
|
||||||
|
import io.github.dsheirer.service.radioreference.SiteRecord;
|
||||||
|
import java.text.DecimalFormat;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* HTML card with the details of radio reference trunked system sites, shown when the mouse is over a site's tower on
|
||||||
|
* the map: the system and protocol, the site, and the site's channels.
|
||||||
|
*/
|
||||||
|
public final class RadioReferenceSiteCard
|
||||||
|
{
|
||||||
|
private static final int MAX_SITES = 3;
|
||||||
|
private static final int CHANNEL_COLUMNS = 3;
|
||||||
|
private static final int MAX_CHANNELS = 24;
|
||||||
|
private static final String SEPARATOR = " · ";
|
||||||
|
|
||||||
|
private RadioReferenceSiteCard()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Card for the sites
|
||||||
|
* @param sites under the mouse, nearest first
|
||||||
|
* @param location of the user, for the distances, or null
|
||||||
|
* @return HTML for a tooltip
|
||||||
|
*/
|
||||||
|
public static String html(List<SiteRecord> sites, RadioReferencePreference.Location location)
|
||||||
|
{
|
||||||
|
DecimalFormat frequencyFormat = new DecimalFormat("0.00000");
|
||||||
|
StringBuilder sb = new StringBuilder("<html><body style='padding:3px'>");
|
||||||
|
int shown = Math.min(sites.size(), MAX_SITES);
|
||||||
|
|
||||||
|
for(int index = 0; index < shown; index++)
|
||||||
|
{
|
||||||
|
SiteRecord site = sites.get(index);
|
||||||
|
|
||||||
|
if(index > 0)
|
||||||
|
{
|
||||||
|
sb.append("<hr>");
|
||||||
|
}
|
||||||
|
|
||||||
|
sb.append("<div><b>").append(escape(site.systemName() != null ? site.systemName() : "(unnamed system)"))
|
||||||
|
.append("</b></div>");
|
||||||
|
appendLine(sb, site.protocol(), site.voice());
|
||||||
|
|
||||||
|
String siteName = "Site " + site.siteNumber();
|
||||||
|
String distance = location != null ? DistanceFormat.format(Coverage.distanceKilometers(
|
||||||
|
location.latitude(), location.longitude(), site.latitude(), site.longitude())) : null;
|
||||||
|
appendLine(sb, siteName, site.description(), site.county(), distance);
|
||||||
|
appendLine(sb, site.nac() != null ? "NAC " + site.nac() : null,
|
||||||
|
site.rfss() > 0 ? "RFSS " + site.rfss() : null, site.zone() > 0 ? "Zone " + site.zone() : null);
|
||||||
|
appendChannels(sb, site.channels(), frequencyFormat);
|
||||||
|
}
|
||||||
|
|
||||||
|
if(sites.size() > shown)
|
||||||
|
{
|
||||||
|
sb.append("<hr><div>+ ").append(sites.size() - shown).append(" more site")
|
||||||
|
.append(sites.size() - shown > 1 ? "s" : "").append(" here</div>");
|
||||||
|
}
|
||||||
|
|
||||||
|
sb.append("</body></html>");
|
||||||
|
return sb.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Channels in columns, control channels marked C and alternate control channels marked A
|
||||||
|
*/
|
||||||
|
private static void appendChannels(StringBuilder sb, List<SiteRecord.SiteChannel> channels,
|
||||||
|
DecimalFormat frequencyFormat)
|
||||||
|
{
|
||||||
|
if(channels == null || channels.isEmpty())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
int shown = Math.min(channels.size(), MAX_CHANNELS);
|
||||||
|
boolean control = false;
|
||||||
|
sb.append("<table cellspacing='0' cellpadding='1'>");
|
||||||
|
|
||||||
|
for(int index = 0; index < shown; index++)
|
||||||
|
{
|
||||||
|
if(index % CHANNEL_COLUMNS == 0)
|
||||||
|
{
|
||||||
|
sb.append("<tr>");
|
||||||
|
}
|
||||||
|
|
||||||
|
SiteRecord.SiteChannel channel = channels.get(index);
|
||||||
|
sb.append("<td style='padding-right:8px'>").append(frequencyFormat.format(channel.frequencyHz() / 1E6));
|
||||||
|
|
||||||
|
if("Control".equals(channel.use()))
|
||||||
|
{
|
||||||
|
sb.append(" <b>C</b>");
|
||||||
|
control = true;
|
||||||
|
}
|
||||||
|
else if("Alternate control".equals(channel.use()))
|
||||||
|
{
|
||||||
|
sb.append(" <b>A</b>");
|
||||||
|
control = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
sb.append("</td>");
|
||||||
|
|
||||||
|
if(index % CHANNEL_COLUMNS == CHANNEL_COLUMNS - 1)
|
||||||
|
{
|
||||||
|
sb.append("</tr>");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(shown % CHANNEL_COLUMNS != 0)
|
||||||
|
{
|
||||||
|
sb.append("</tr>");
|
||||||
|
}
|
||||||
|
|
||||||
|
sb.append("</table>");
|
||||||
|
List<String> notes = new ArrayList<>();
|
||||||
|
|
||||||
|
if(channels.size() > shown)
|
||||||
|
{
|
||||||
|
notes.add("+ " + (channels.size() - shown) + " more channels");
|
||||||
|
}
|
||||||
|
|
||||||
|
if(control)
|
||||||
|
{
|
||||||
|
notes.add("C control, A alternate control");
|
||||||
|
}
|
||||||
|
|
||||||
|
if(!notes.isEmpty())
|
||||||
|
{
|
||||||
|
appendLine(sb, notes.toArray(new String[0]));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Appends a line with the non-empty values separated by dots, or nothing when all are empty
|
||||||
|
*/
|
||||||
|
private static void appendLine(StringBuilder sb, String... values)
|
||||||
|
{
|
||||||
|
StringBuilder line = new StringBuilder();
|
||||||
|
|
||||||
|
for(String value: values)
|
||||||
|
{
|
||||||
|
if(value != null && !value.isBlank())
|
||||||
|
{
|
||||||
|
if(!line.isEmpty())
|
||||||
|
{
|
||||||
|
line.append(SEPARATOR);
|
||||||
|
}
|
||||||
|
|
||||||
|
line.append(escape(value));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(!line.isEmpty())
|
||||||
|
{
|
||||||
|
sb.append("<div>").append(line).append("</div>");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String escape(String text)
|
||||||
|
{
|
||||||
|
return text.replace("&", "&").replace("<", "<").replace(">", ">").replace("\"", """);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,184 @@
|
|||||||
|
/*
|
||||||
|
* *****************************************************************************
|
||||||
|
* Copyright (C) 2014-2026 Dennis Sheirer
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||||
|
* ****************************************************************************
|
||||||
|
*/
|
||||||
|
|
||||||
|
package io.github.dsheirer.map;
|
||||||
|
|
||||||
|
import io.github.dsheirer.service.radioreference.SiteRecord;
|
||||||
|
import java.awt.BasicStroke;
|
||||||
|
import java.awt.Color;
|
||||||
|
import java.awt.Graphics2D;
|
||||||
|
import java.awt.Point;
|
||||||
|
import java.awt.Rectangle;
|
||||||
|
import java.awt.Stroke;
|
||||||
|
import java.awt.geom.Arc2D;
|
||||||
|
import java.awt.geom.Ellipse2D;
|
||||||
|
import java.awt.geom.Path2D;
|
||||||
|
import java.awt.geom.Point2D;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.function.Supplier;
|
||||||
|
import org.jdesktop.swingx.JXMapViewer;
|
||||||
|
import org.jdesktop.swingx.mapviewer.GeoPosition;
|
||||||
|
import org.jdesktop.swingx.painter.AbstractPainter;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Paints a radio tower at each radio reference trunked system site, with the base of the tower at the site location.
|
||||||
|
*/
|
||||||
|
public class RadioReferenceSitePainter extends AbstractPainter<JXMapViewer>
|
||||||
|
{
|
||||||
|
private static final Color TOWER = new Color(240, 128, 32);
|
||||||
|
private static final Color OUTLINE = new Color(40, 40, 40, 200);
|
||||||
|
private static final Stroke TOWER_STROKE = new BasicStroke(1.6f, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND);
|
||||||
|
private static final Stroke OUTLINE_STROKE = new BasicStroke(3.6f, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND);
|
||||||
|
private static final double HEIGHT = 16;
|
||||||
|
private static final double HALF_BASE = 5;
|
||||||
|
//Hit area around the tower, in pixels from the site location
|
||||||
|
private static final Rectangle HIT_AREA = new Rectangle(-10, -24, 20, 28);
|
||||||
|
|
||||||
|
private final Supplier<List<SiteRecord>> mSites;
|
||||||
|
private volatile boolean mShowSites = true;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructs an instance
|
||||||
|
* @param sites to paint, read each time the map is painted
|
||||||
|
*/
|
||||||
|
public RadioReferenceSitePainter(Supplier<List<SiteRecord>> sites)
|
||||||
|
{
|
||||||
|
mSites = sites;
|
||||||
|
setAntialiasing(true);
|
||||||
|
setCacheable(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Shows or hides the sites
|
||||||
|
*/
|
||||||
|
public void setShowSites(boolean show)
|
||||||
|
{
|
||||||
|
mShowSites = show;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isShowSites()
|
||||||
|
{
|
||||||
|
return mShowSites;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sites whose tower is under the point, nearest first
|
||||||
|
* @param map viewer
|
||||||
|
* @param point in the viewer
|
||||||
|
* @return sites, or an empty list when the sites are hidden or none is under the point
|
||||||
|
*/
|
||||||
|
public List<SiteRecord> getSitesAt(JXMapViewer map, Point point)
|
||||||
|
{
|
||||||
|
if(!mShowSites)
|
||||||
|
{
|
||||||
|
return Collections.emptyList();
|
||||||
|
}
|
||||||
|
|
||||||
|
Rectangle viewport = map.getViewportBounds();
|
||||||
|
List<SiteRecord> sites = new ArrayList<>();
|
||||||
|
List<Double> distances = new ArrayList<>();
|
||||||
|
|
||||||
|
for(SiteRecord site: mSites.get())
|
||||||
|
{
|
||||||
|
Point2D pixel = map.getTileFactory().geoToPixel(new GeoPosition(site.latitude(), site.longitude()),
|
||||||
|
map.getZoom());
|
||||||
|
double dx = point.x - (pixel.getX() - viewport.getX());
|
||||||
|
double dy = point.y - (pixel.getY() - viewport.getY());
|
||||||
|
|
||||||
|
if(HIT_AREA.contains(dx, dy))
|
||||||
|
{
|
||||||
|
//Nearest to the middle of the tower first
|
||||||
|
double distance = Math.hypot(dx, dy + (HEIGHT / 2.0));
|
||||||
|
int index = 0;
|
||||||
|
|
||||||
|
while(index < distances.size() && distances.get(index) <= distance)
|
||||||
|
{
|
||||||
|
index++;
|
||||||
|
}
|
||||||
|
|
||||||
|
sites.add(index, site);
|
||||||
|
distances.add(index, distance);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return sites;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void doPaint(Graphics2D g, JXMapViewer map, int width, int height)
|
||||||
|
{
|
||||||
|
if(!mShowSites)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
Rectangle viewport = map.getViewportBounds();
|
||||||
|
|
||||||
|
for(SiteRecord site: mSites.get())
|
||||||
|
{
|
||||||
|
Point2D pixel = map.getTileFactory().geoToPixel(new GeoPosition(site.latitude(), site.longitude()),
|
||||||
|
map.getZoom());
|
||||||
|
double x = pixel.getX() - viewport.getX();
|
||||||
|
double y = pixel.getY() - viewport.getY();
|
||||||
|
|
||||||
|
if(x >= -20 && x <= width + 20 && y >= -4 && y <= height + 30)
|
||||||
|
{
|
||||||
|
paintTower(g, x, y);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Paints a tower with its base at the point: an A-frame mast with a cross brace and radio waves at the top
|
||||||
|
*/
|
||||||
|
private static void paintTower(Graphics2D g, double x, double y)
|
||||||
|
{
|
||||||
|
double top = y - HEIGHT;
|
||||||
|
Path2D mast = new Path2D.Double();
|
||||||
|
mast.moveTo(x - HALF_BASE, y);
|
||||||
|
mast.lineTo(x, top);
|
||||||
|
mast.lineTo(x + HALF_BASE, y);
|
||||||
|
mast.moveTo(x - (HALF_BASE * 0.55), y - (HEIGHT * 0.45));
|
||||||
|
mast.lineTo(x + (HALF_BASE * 0.55), y - (HEIGHT * 0.45));
|
||||||
|
|
||||||
|
Arc2D leftInner = new Arc2D.Double(x - 5, top - 4, 10, 8, 135, 90, Arc2D.OPEN);
|
||||||
|
Arc2D rightInner = new Arc2D.Double(x - 5, top - 4, 10, 8, -45, 90, Arc2D.OPEN);
|
||||||
|
Arc2D leftOuter = new Arc2D.Double(x - 9, top - 7, 18, 14, 135, 90, Arc2D.OPEN);
|
||||||
|
Arc2D rightOuter = new Arc2D.Double(x - 9, top - 7, 18, 14, -45, 90, Arc2D.OPEN);
|
||||||
|
|
||||||
|
g.setStroke(OUTLINE_STROKE);
|
||||||
|
g.setColor(OUTLINE);
|
||||||
|
g.draw(mast);
|
||||||
|
g.draw(leftInner);
|
||||||
|
g.draw(rightInner);
|
||||||
|
g.draw(leftOuter);
|
||||||
|
g.draw(rightOuter);
|
||||||
|
|
||||||
|
g.setStroke(TOWER_STROKE);
|
||||||
|
g.setColor(TOWER);
|
||||||
|
g.draw(mast);
|
||||||
|
g.draw(leftInner);
|
||||||
|
g.draw(rightInner);
|
||||||
|
g.draw(leftOuter);
|
||||||
|
g.draw(rightOuter);
|
||||||
|
g.fill(new Ellipse2D.Double(x - 2, top - 2, 4, 4));
|
||||||
|
}
|
||||||
|
}
|
||||||
104
src/main/java/io/github/dsheirer/map/SelectionAdapter.java
Normal file
104
src/main/java/io/github/dsheirer/map/SelectionAdapter.java
Normal file
@@ -0,0 +1,104 @@
|
|||||||
|
/*******************************************************************************
|
||||||
|
* SDR Trunk
|
||||||
|
* Copyright (C) 2014 Dennis Sheirer
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||||
|
******************************************************************************/
|
||||||
|
package io.github.dsheirer.map;
|
||||||
|
|
||||||
|
import org.apache.commons.math3.util.FastMath;
|
||||||
|
import org.jdesktop.swingx.JXMapViewer;
|
||||||
|
|
||||||
|
import java.awt.*;
|
||||||
|
import java.awt.event.MouseAdapter;
|
||||||
|
import java.awt.event.MouseEvent;
|
||||||
|
import java.awt.geom.Point2D;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates a selection rectangle based on mouse input
|
||||||
|
* Also triggers repaint events in the viewer
|
||||||
|
* @author Martin Steiger
|
||||||
|
*/
|
||||||
|
public class SelectionAdapter extends MouseAdapter
|
||||||
|
{
|
||||||
|
private boolean dragging;
|
||||||
|
private JXMapViewer viewer;
|
||||||
|
|
||||||
|
private Point2D startPos = new Point2D.Double();
|
||||||
|
private Point2D endPos = new Point2D.Double();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param viewer the jxmapviewer
|
||||||
|
*/
|
||||||
|
public SelectionAdapter(JXMapViewer viewer)
|
||||||
|
{
|
||||||
|
this.viewer = viewer;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void mousePressed(MouseEvent e)
|
||||||
|
{
|
||||||
|
if (e.getButton() != MouseEvent.BUTTON3)
|
||||||
|
return;
|
||||||
|
|
||||||
|
startPos.setLocation(e.getX(), e.getY());
|
||||||
|
endPos.setLocation(e.getX(), e.getY());
|
||||||
|
|
||||||
|
dragging = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void mouseDragged(MouseEvent e)
|
||||||
|
{
|
||||||
|
if (!dragging)
|
||||||
|
return;
|
||||||
|
|
||||||
|
endPos.setLocation(e.getX(), e.getY());
|
||||||
|
|
||||||
|
viewer.repaint();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void mouseReleased(MouseEvent e)
|
||||||
|
{
|
||||||
|
if (!dragging)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (e.getButton() != MouseEvent.BUTTON3)
|
||||||
|
return;
|
||||||
|
|
||||||
|
viewer.repaint();
|
||||||
|
|
||||||
|
dragging = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return the selection rectangle
|
||||||
|
*/
|
||||||
|
public Rectangle getRectangle()
|
||||||
|
{
|
||||||
|
if (dragging)
|
||||||
|
{
|
||||||
|
int x1 = (int) FastMath.min(startPos.getX(), endPos.getX());
|
||||||
|
int y1 = (int) FastMath.min(startPos.getY(), endPos.getY());
|
||||||
|
int x2 = (int) FastMath.max(startPos.getX(), endPos.getX());
|
||||||
|
int y2 = (int) FastMath.max(startPos.getY(), endPos.getY());
|
||||||
|
|
||||||
|
return new Rectangle(x1, y1, x2-x1, y2-y1);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
56
src/main/java/io/github/dsheirer/map/SelectionPainter.java
Normal file
56
src/main/java/io/github/dsheirer/map/SelectionPainter.java
Normal file
@@ -0,0 +1,56 @@
|
|||||||
|
/*******************************************************************************
|
||||||
|
* SDR Trunk
|
||||||
|
* Copyright (C) 2014 Dennis Sheirer
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||||
|
******************************************************************************/
|
||||||
|
package io.github.dsheirer.map;
|
||||||
|
|
||||||
|
import org.jdesktop.swingx.painter.Painter;
|
||||||
|
|
||||||
|
import java.awt.*;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Paints a selection rectangle
|
||||||
|
* @author Martin Steiger
|
||||||
|
*/
|
||||||
|
public class SelectionPainter implements Painter<Object>
|
||||||
|
{
|
||||||
|
private Color fillColor = new Color(128, 192, 255, 128);
|
||||||
|
private Color frameColor = new Color(0, 0, 255, 128);
|
||||||
|
|
||||||
|
private SelectionAdapter adapter;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param adapter the selection adapter
|
||||||
|
*/
|
||||||
|
public SelectionPainter(SelectionAdapter adapter)
|
||||||
|
{
|
||||||
|
this.adapter = adapter;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void paint(Graphics2D g, Object t, int width, int height)
|
||||||
|
{
|
||||||
|
Rectangle rc = adapter.getRectangle();
|
||||||
|
|
||||||
|
if (rc != null)
|
||||||
|
{
|
||||||
|
g.setColor(frameColor);
|
||||||
|
g.draw(rc);
|
||||||
|
g.setColor(fillColor);
|
||||||
|
g.fill(rc);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
package io.github.dsheirer.map;
|
package io.github.dsheirer.map;
|
||||||
|
|
||||||
|
import org.jdesktop.swingx.mapviewer.GeoPosition;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Timestamped geo position
|
* Timestamped geo position
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ import java.util.List;
|
|||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
import java.util.concurrent.ScheduledFuture;
|
import java.util.concurrent.ScheduledFuture;
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
|
import org.jdesktop.swingx.mapviewer.GeoPosition;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Map test track data generator.
|
* Map test track data generator.
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* *****************************************************************************
|
* *****************************************************************************
|
||||||
* Copyright (C) 2014-2026 Dennis Sheirer
|
* Copyright (C) 2014-2025 Dennis Sheirer
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -19,16 +19,23 @@
|
|||||||
|
|
||||||
package io.github.dsheirer.map;
|
package io.github.dsheirer.map;
|
||||||
|
|
||||||
|
import java.text.DecimalFormat;
|
||||||
|
import java.text.SimpleDateFormat;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
import javax.swing.table.AbstractTableModel;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Location history of a plottable entity, newest first. Thread safe: positions are added on the decode event thread
|
* Track history table model.
|
||||||
* and read on the JavaFX thread.
|
|
||||||
*/
|
*/
|
||||||
public class TrackHistoryModel
|
public class TrackHistoryModel extends AbstractTableModel
|
||||||
{
|
{
|
||||||
public static final int MAX_LOCATION_HISTORY = 10;
|
public static final int MAX_LOCATION_HISTORY = 10;
|
||||||
|
private static final String[] COLUMNS = new String[]{"Time", "Latitude", "Longitude"};
|
||||||
|
private final SimpleDateFormat mSimpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||||
|
private final DecimalFormat mDegreeFormat = new DecimalFormat("0.00000");
|
||||||
private final List<TimestampedGeoPosition> mTimestampedGeoPositions = new ArrayList<>();
|
private final List<TimestampedGeoPosition> mTimestampedGeoPositions = new ArrayList<>();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -39,46 +46,48 @@ public class TrackHistoryModel
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Snapshot of the history for this entity, newest first.
|
* Complete history for this entity.
|
||||||
*/
|
*/
|
||||||
public synchronized List<TimestampedGeoPosition> getTrackHistory()
|
public List<TimestampedGeoPosition> getTrackHistory()
|
||||||
{
|
{
|
||||||
return List.copyOf(mTimestampedGeoPositions);
|
return Collections.unmodifiableList(mTimestampedGeoPositions);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Adds the position to the history if it is unique and trims the history to MAX_LOCATION_HISTORY size.
|
* Adds the position to the history if it is unique and trims the history to MAX_LOCATION_HISTORY size.
|
||||||
* @param latest position to add.
|
* @param latest position to add.
|
||||||
* @return true if the position was added
|
|
||||||
*/
|
*/
|
||||||
public synchronized boolean add(TimestampedGeoPosition latest)
|
public void add(TimestampedGeoPosition latest)
|
||||||
{
|
{
|
||||||
TimestampedGeoPosition mostRecentPosition = mTimestampedGeoPositions.isEmpty() ? null :
|
TimestampedGeoPosition mostRecentPosition = null;
|
||||||
mTimestampedGeoPositions.getFirst();
|
|
||||||
|
if(!mTimestampedGeoPositions.isEmpty())
|
||||||
|
{
|
||||||
|
mostRecentPosition = mTimestampedGeoPositions.getFirst();
|
||||||
|
}
|
||||||
|
|
||||||
if(isUnique(latest, mostRecentPosition))
|
if(isUnique(latest, mostRecentPosition))
|
||||||
{
|
{
|
||||||
mTimestampedGeoPositions.addFirst(latest);
|
mTimestampedGeoPositions.addFirst(latest);
|
||||||
|
fireTableRowsInserted(0, 0);
|
||||||
|
|
||||||
while(mTimestampedGeoPositions.size() > MAX_LOCATION_HISTORY)
|
while(mTimestampedGeoPositions.size() > MAX_LOCATION_HISTORY)
|
||||||
{
|
{
|
||||||
|
int index = mTimestampedGeoPositions.size() - 1;
|
||||||
mTimestampedGeoPositions.removeLast();
|
mTimestampedGeoPositions.removeLast();
|
||||||
|
fireTableRowsDeleted(index, index);
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Indicates if the latest time is more than 2 seconds newer than the previous position or either the latitude or
|
* Indicates if the latest time and position is at least 30 seconds newer than the previous position and either the
|
||||||
* longitude differs by more than 0.00001 degrees.
|
* latitude or longitude differs by at least 0.00001 degrees.
|
||||||
* @param latest location
|
* @param latest location
|
||||||
* @param previous location
|
* @param previous location
|
||||||
* @return indication of uniqueness.
|
* @return indication of uniqueness.
|
||||||
*/
|
*/
|
||||||
private static boolean isUnique(TimestampedGeoPosition latest, TimestampedGeoPosition previous)
|
private boolean isUnique(TimestampedGeoPosition latest, TimestampedGeoPosition previous)
|
||||||
{
|
{
|
||||||
if(latest != null && previous == null)
|
if(latest != null && previous == null)
|
||||||
{
|
{
|
||||||
@@ -97,10 +106,10 @@ public class TrackHistoryModel
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the geo position at the specified index
|
* Get the geo position at the specified index
|
||||||
* @param index to retrieve, 0 for the newest
|
* @param index to retrieve
|
||||||
* @return geo or null.
|
* @return geo or null.
|
||||||
*/
|
*/
|
||||||
public synchronized TimestampedGeoPosition get(int index)
|
public TimestampedGeoPosition get(int index)
|
||||||
{
|
{
|
||||||
if(index >= 0 && index < mTimestampedGeoPositions.size())
|
if(index >= 0 && index < mTimestampedGeoPositions.size())
|
||||||
{
|
{
|
||||||
@@ -110,11 +119,38 @@ public class TrackHistoryModel
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
@Override
|
||||||
* Number of positions in the history
|
public int getRowCount()
|
||||||
*/
|
|
||||||
public synchronized int size()
|
|
||||||
{
|
{
|
||||||
return mTimestampedGeoPositions.size();
|
return mTimestampedGeoPositions.size();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getColumnCount()
|
||||||
|
{
|
||||||
|
return COLUMNS.length;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getColumnName(int column)
|
||||||
|
{
|
||||||
|
return COLUMNS[column];
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Object getValueAt(int rowIndex, int columnIndex)
|
||||||
|
{
|
||||||
|
TimestampedGeoPosition geoPosition = mTimestampedGeoPositions.get(rowIndex);
|
||||||
|
switch (columnIndex)
|
||||||
|
{
|
||||||
|
case 0:
|
||||||
|
return mSimpleDateFormat.format(geoPosition.getTimestamp());
|
||||||
|
case 1:
|
||||||
|
return mDegreeFormat.format(geoPosition.getLatitude());
|
||||||
|
case 2:
|
||||||
|
return mDegreeFormat.format(geoPosition.getLongitude());
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
109
src/main/java/io/github/dsheirer/map/UserLocationPainter.java
Normal file
109
src/main/java/io/github/dsheirer/map/UserLocationPainter.java
Normal file
@@ -0,0 +1,109 @@
|
|||||||
|
/*
|
||||||
|
* *****************************************************************************
|
||||||
|
* Copyright (C) 2014-2026 Dennis Sheirer
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||||
|
* ****************************************************************************
|
||||||
|
*/
|
||||||
|
|
||||||
|
package io.github.dsheirer.map;
|
||||||
|
|
||||||
|
import java.awt.BasicStroke;
|
||||||
|
import java.awt.Color;
|
||||||
|
import java.awt.Graphics2D;
|
||||||
|
import java.awt.Rectangle;
|
||||||
|
import java.awt.geom.Ellipse2D;
|
||||||
|
import java.awt.geom.Line2D;
|
||||||
|
import java.awt.geom.Point2D;
|
||||||
|
import org.jdesktop.swingx.JXMapViewer;
|
||||||
|
import org.jdesktop.swingx.mapviewer.GeoPosition;
|
||||||
|
import org.jdesktop.swingx.painter.AbstractPainter;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Paints a push-pin at the user's location, with the tip of the pin at the location.
|
||||||
|
*/
|
||||||
|
public class UserLocationPainter extends AbstractPainter<JXMapViewer>
|
||||||
|
{
|
||||||
|
private static final Color NEEDLE = new Color(90, 90, 90);
|
||||||
|
private static final Color HEAD = new Color(220, 40, 40);
|
||||||
|
private static final Color HEAD_OUTLINE = new Color(110, 0, 0);
|
||||||
|
private static final Color HIGHLIGHT = new Color(255, 255, 255, 170);
|
||||||
|
private static final Color SHADOW = new Color(0, 0, 0, 70);
|
||||||
|
private static final double NEEDLE_LENGTH = 14.0;
|
||||||
|
private static final double HEAD_RADIUS = 7.0;
|
||||||
|
|
||||||
|
private volatile GeoPosition mPosition;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructs an instance
|
||||||
|
*/
|
||||||
|
public UserLocationPainter()
|
||||||
|
{
|
||||||
|
setAntialiasing(true);
|
||||||
|
setCacheable(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the location to mark
|
||||||
|
* @param position of the user, or null to remove the pin
|
||||||
|
*/
|
||||||
|
public void setPosition(GeoPosition position)
|
||||||
|
{
|
||||||
|
mPosition = position;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Location that is marked
|
||||||
|
* @return position, or null
|
||||||
|
*/
|
||||||
|
public GeoPosition getPosition()
|
||||||
|
{
|
||||||
|
return mPosition;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void doPaint(Graphics2D g, JXMapViewer map, int width, int height)
|
||||||
|
{
|
||||||
|
GeoPosition position = mPosition;
|
||||||
|
|
||||||
|
if(position == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
Rectangle viewportBounds = map.getViewportBounds();
|
||||||
|
Point2D point = map.getTileFactory().geoToPixel(position, map.getZoom());
|
||||||
|
double x = point.getX() - viewportBounds.getX();
|
||||||
|
double y = point.getY() - viewportBounds.getY();
|
||||||
|
double headY = y - NEEDLE_LENGTH - HEAD_RADIUS;
|
||||||
|
|
||||||
|
//Shadow where the needle enters the map, so the tip reads as the location
|
||||||
|
g.setColor(SHADOW);
|
||||||
|
g.fill(new Ellipse2D.Double(x - 4, y - 2, 8, 4));
|
||||||
|
|
||||||
|
g.setColor(NEEDLE);
|
||||||
|
g.setStroke(new BasicStroke(2.0f, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
|
||||||
|
g.draw(new Line2D.Double(x, y, x, headY));
|
||||||
|
|
||||||
|
Ellipse2D head = new Ellipse2D.Double(x - HEAD_RADIUS, headY - HEAD_RADIUS, HEAD_RADIUS * 2, HEAD_RADIUS * 2);
|
||||||
|
g.setColor(HEAD);
|
||||||
|
g.fill(head);
|
||||||
|
g.setColor(HEAD_OUTLINE);
|
||||||
|
g.setStroke(new BasicStroke(1.0f));
|
||||||
|
g.draw(head);
|
||||||
|
|
||||||
|
g.setColor(HIGHLIGHT);
|
||||||
|
g.fill(new Ellipse2D.Double(x - HEAD_RADIUS / 2 - 1, headY - HEAD_RADIUS / 2 - 1, 4, 4));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -20,7 +20,6 @@ package io.github.dsheirer.module.decode;
|
|||||||
|
|
||||||
import io.github.dsheirer.alias.AliasList;
|
import io.github.dsheirer.alias.AliasList;
|
||||||
import io.github.dsheirer.alias.AliasModel;
|
import io.github.dsheirer.alias.AliasModel;
|
||||||
import io.github.dsheirer.alias.TalkerAliasAutoAdder;
|
|
||||||
import io.github.dsheirer.alias.action.AliasActionManager;
|
import io.github.dsheirer.alias.action.AliasActionManager;
|
||||||
import io.github.dsheirer.audio.*;
|
import io.github.dsheirer.audio.*;
|
||||||
import io.github.dsheirer.audio.codec.mbe.JmbeAudioModule;
|
import io.github.dsheirer.audio.codec.mbe.JmbeAudioModule;
|
||||||
@@ -211,37 +210,9 @@ public class DecoderFactory
|
|||||||
throw new IllegalArgumentException("Unknown decoder type [" + decodeConfig.getDecoderType().toString() + "]");
|
throw new IllegalArgumentException("Unknown decoder type [" + decodeConfig.getDecoderType().toString() + "]");
|
||||||
}
|
}
|
||||||
|
|
||||||
configureTalkerAliasAutoAdd(channel, modules, aliasModel);
|
|
||||||
|
|
||||||
return modules;
|
return modules;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Configures the traffic channel manager of a standard (control) channel to automatically add talker aliases to
|
|
||||||
* the channel's alias list, when the channel is configured for it. Traffic channels share the talker alias manager
|
|
||||||
* of their control channel, so they use the control channel's setting.
|
|
||||||
* @param channel configuration
|
|
||||||
* @param modules for the channel
|
|
||||||
* @param aliasModel to add aliases to
|
|
||||||
*/
|
|
||||||
private static void configureTalkerAliasAutoAdd(Channel channel, List<Module> modules, AliasModel aliasModel)
|
|
||||||
{
|
|
||||||
if(channel.isStandardChannel() && channel.isAutoAddTalkerAliases() &&
|
|
||||||
channel.getDecodeConfiguration().getDecoderType().providesTalkerAlias() &&
|
|
||||||
channel.getAliasListName() != null && !channel.getAliasListName().isEmpty())
|
|
||||||
{
|
|
||||||
TalkerAliasAutoAdder autoAdder = new TalkerAliasAutoAdder(aliasModel, channel.getAliasListName());
|
|
||||||
|
|
||||||
for(Module module: modules)
|
|
||||||
{
|
|
||||||
if(module instanceof TrafficChannelManager tcm && tcm.getTalkerAliasManager() != null)
|
|
||||||
{
|
|
||||||
tcm.getTalkerAliasManager().setTalkerAliasListener(autoAdder);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates decoder modules for APCO-25 Phase 2 decoder
|
* Creates decoder modules for APCO-25 Phase 2 decoder
|
||||||
* @param channel configuration
|
* @param channel configuration
|
||||||
|
|||||||
@@ -78,11 +78,6 @@ public enum DecoderType
|
|||||||
*/
|
*/
|
||||||
public static final EnumSet<DecoderType> MBE_AUDIO_CODEC_DECODERS = EnumSet.of(DMR, NXDN, P25_PHASE1, P25_PHASE2);
|
public static final EnumSet<DecoderType> MBE_AUDIO_CODEC_DECODERS = EnumSet.of(DMR, NXDN, P25_PHASE1, P25_PHASE2);
|
||||||
|
|
||||||
/**
|
|
||||||
* Decoders that produce talker aliases
|
|
||||||
*/
|
|
||||||
public static final EnumSet<DecoderType> TALKER_ALIAS_DECODERS = EnumSet.of(DMR, NXDN, P25_PHASE1, P25_PHASE2);
|
|
||||||
|
|
||||||
public Protocol getProtocol()
|
public Protocol getProtocol()
|
||||||
{
|
{
|
||||||
return mProtocol;
|
return mProtocol;
|
||||||
@@ -119,12 +114,4 @@ public enum DecoderType
|
|||||||
{
|
{
|
||||||
return MBE_AUDIO_CODEC_DECODERS.contains(this);
|
return MBE_AUDIO_CODEC_DECODERS.contains(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Indicates if the decoder type produces talker aliases
|
|
||||||
*/
|
|
||||||
public boolean providesTalkerAlias()
|
|
||||||
{
|
|
||||||
return TALKER_ALIAS_DECODERS.contains(this);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -108,7 +108,7 @@ import io.github.dsheirer.source.tuner.channel.rotation.AddChannelRotationActive
|
|||||||
import io.github.dsheirer.util.PacketUtil;
|
import io.github.dsheirer.util.PacketUtil;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import io.github.dsheirer.map.GeoPosition;
|
import org.jdesktop.swingx.mapviewer.GeoPosition;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
|||||||
@@ -135,7 +135,6 @@ public class DMRTrafficChannelManager extends TrafficChannelManager implements I
|
|||||||
/**
|
/**
|
||||||
* Talker alias manager
|
* Talker alias manager
|
||||||
*/
|
*/
|
||||||
@Override
|
|
||||||
public TalkerAliasManager getTalkerAliasManager()
|
public TalkerAliasManager getTalkerAliasManager()
|
||||||
{
|
{
|
||||||
return mTalkerAliasManager;
|
return mTalkerAliasManager;
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ import io.github.dsheirer.module.decode.dmr.message.type.PositionError;
|
|||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import org.apache.commons.math3.util.FastMath;
|
import org.apache.commons.math3.util.FastMath;
|
||||||
import io.github.dsheirer.map.GeoPosition;
|
import org.jdesktop.swingx.mapviewer.GeoPosition;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* GPS Information
|
* GPS Information
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ package io.github.dsheirer.module.decode.event;
|
|||||||
import io.github.dsheirer.channel.IChannelDescriptor;
|
import io.github.dsheirer.channel.IChannelDescriptor;
|
||||||
import io.github.dsheirer.identifier.IdentifierCollection;
|
import io.github.dsheirer.identifier.IdentifierCollection;
|
||||||
import io.github.dsheirer.protocol.Protocol;
|
import io.github.dsheirer.protocol.Protocol;
|
||||||
import io.github.dsheirer.map.GeoPosition;
|
import org.jdesktop.swingx.mapviewer.GeoPosition;
|
||||||
|
|
||||||
public class PlottableDecodeEvent extends DecodeEvent
|
public class PlottableDecodeEvent extends DecodeEvent
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ package io.github.dsheirer.module.decode.fleetsync2.message;
|
|||||||
|
|
||||||
import io.github.dsheirer.bits.CorrectedBinaryMessage;
|
import io.github.dsheirer.bits.CorrectedBinaryMessage;
|
||||||
import io.github.dsheirer.identifier.Identifier;
|
import io.github.dsheirer.identifier.Identifier;
|
||||||
import io.github.dsheirer.map.GeoPosition;
|
import org.jdesktop.swingx.mapviewer.GeoPosition;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Calendar;
|
import java.util.Calendar;
|
||||||
|
|||||||
@@ -148,7 +148,6 @@ public class NXDNTrafficChannelManager extends TrafficChannelManager implements
|
|||||||
/**
|
/**
|
||||||
* Talker alias manager
|
* Talker alias manager
|
||||||
*/
|
*/
|
||||||
@Override
|
|
||||||
public TalkerAliasManager getTalkerAliasManager()
|
public TalkerAliasManager getTalkerAliasManager()
|
||||||
{
|
{
|
||||||
return mTalkerAliasManager;
|
return mTalkerAliasManager;
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ import java.util.Date;
|
|||||||
import java.util.GregorianCalendar;
|
import java.util.GregorianCalendar;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.TimeZone;
|
import java.util.TimeZone;
|
||||||
import io.github.dsheirer.map.GeoPosition;
|
import org.jdesktop.swingx.mapviewer.GeoPosition;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* JVC/Kenwood NEXEDGE GPS position report.
|
* JVC/Kenwood NEXEDGE GPS position report.
|
||||||
|
|||||||
@@ -165,7 +165,6 @@ public class P25TrafficChannelManager extends TrafficChannelManager implements I
|
|||||||
* Talker alias manager
|
* Talker alias manager
|
||||||
* @return manager
|
* @return manager
|
||||||
*/
|
*/
|
||||||
@Override
|
|
||||||
public TalkerAliasManager getTalkerAliasManager()
|
public TalkerAliasManager getTalkerAliasManager()
|
||||||
{
|
{
|
||||||
return mTalkerAliasManager;
|
return mTalkerAliasManager;
|
||||||
|
|||||||
@@ -175,7 +175,7 @@ import io.github.dsheirer.sample.Listener;
|
|||||||
import io.github.dsheirer.util.PacketUtil;
|
import io.github.dsheirer.util.PacketUtil;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import io.github.dsheirer.map.GeoPosition;
|
import org.jdesktop.swingx.mapviewer.GeoPosition;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ import java.text.SimpleDateFormat;
|
|||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.TimeZone;
|
import java.util.TimeZone;
|
||||||
import io.github.dsheirer.map.GeoPosition;
|
import org.jdesktop.swingx.mapviewer.GeoPosition;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* L3Harris Talker GPS Complete. This message is assembled from FLC L3Harris Talker GPS Block 1 and Block 2.
|
* L3Harris Talker GPS Complete. This message is assembled from FLC L3Harris Talker GPS Block 1 and Block 2.
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ import io.github.dsheirer.module.decode.dmr.identifier.P25Location;
|
|||||||
import io.github.dsheirer.module.decode.p25.phase1.message.lc.LinkControlWord;
|
import io.github.dsheirer.module.decode.p25.phase1.message.lc.LinkControlWord;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import io.github.dsheirer.map.GeoPosition;
|
import org.jdesktop.swingx.mapviewer.GeoPosition;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Motorola Unit Self-Reported GPS Location
|
* Motorola Unit Self-Reported GPS Location
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ import java.text.SimpleDateFormat;
|
|||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.TimeZone;
|
import java.util.TimeZone;
|
||||||
import io.github.dsheirer.map.GeoPosition;
|
import org.jdesktop.swingx.mapviewer.GeoPosition;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* L3Harris Talker GPS Location.
|
* L3Harris Talker GPS Location.
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ import io.github.dsheirer.module.decode.event.PlottableDecodeEvent;
|
|||||||
import io.github.dsheirer.module.decode.tait.identifier.TaitIdentifier;
|
import io.github.dsheirer.module.decode.tait.identifier.TaitIdentifier;
|
||||||
import io.github.dsheirer.protocol.Protocol;
|
import io.github.dsheirer.protocol.Protocol;
|
||||||
import java.util.TreeSet;
|
import java.util.TreeSet;
|
||||||
import io.github.dsheirer.map.GeoPosition;
|
import org.jdesktop.swingx.mapviewer.GeoPosition;
|
||||||
|
|
||||||
public class Tait1200DecoderState extends DecoderState
|
public class Tait1200DecoderState extends DecoderState
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ import io.github.dsheirer.identifier.Identifier;
|
|||||||
import io.github.dsheirer.message.Message;
|
import io.github.dsheirer.message.Message;
|
||||||
import io.github.dsheirer.module.decode.tait.identifier.TaitIdentifier;
|
import io.github.dsheirer.module.decode.tait.identifier.TaitIdentifier;
|
||||||
import io.github.dsheirer.protocol.Protocol;
|
import io.github.dsheirer.protocol.Protocol;
|
||||||
import io.github.dsheirer.map.GeoPosition;
|
import org.jdesktop.swingx.mapviewer.GeoPosition;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
|||||||
@@ -20,7 +20,6 @@
|
|||||||
package io.github.dsheirer.module.decode.traffic;
|
package io.github.dsheirer.module.decode.traffic;
|
||||||
|
|
||||||
import io.github.dsheirer.controller.channel.Channel;
|
import io.github.dsheirer.controller.channel.Channel;
|
||||||
import io.github.dsheirer.identifier.alias.TalkerAliasManager;
|
|
||||||
import io.github.dsheirer.module.Module;
|
import io.github.dsheirer.module.Module;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -37,15 +36,6 @@ public abstract class TrafficChannelManager extends Module
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Talker alias manager shared by the control and traffic channels of the system.
|
|
||||||
* @return talker alias manager, or null if the protocol doesn't have talker aliases.
|
|
||||||
*/
|
|
||||||
public TalkerAliasManager getTalkerAliasManager()
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Current control frequency
|
* Current control frequency
|
||||||
* @return frequency in hertz
|
* @return frequency in hertz
|
||||||
|
|||||||
@@ -24,7 +24,6 @@ import com.fasterxml.jackson.databind.SerializationFeature;
|
|||||||
import com.fasterxml.jackson.dataformat.xml.JacksonXmlModule;
|
import com.fasterxml.jackson.dataformat.xml.JacksonXmlModule;
|
||||||
import com.fasterxml.jackson.dataformat.xml.XmlMapper;
|
import com.fasterxml.jackson.dataformat.xml.XmlMapper;
|
||||||
import io.github.dsheirer.alias.Alias;
|
import io.github.dsheirer.alias.Alias;
|
||||||
import io.github.dsheirer.alias.AliasListConfiguration;
|
|
||||||
import io.github.dsheirer.alias.AliasModel;
|
import io.github.dsheirer.alias.AliasModel;
|
||||||
import io.github.dsheirer.audio.broadcast.BroadcastModel;
|
import io.github.dsheirer.audio.broadcast.BroadcastModel;
|
||||||
import io.github.dsheirer.controller.channel.Channel.ChannelType;
|
import io.github.dsheirer.controller.channel.Channel.ChannelType;
|
||||||
@@ -40,7 +39,6 @@ import io.github.dsheirer.module.log.EventLogManager;
|
|||||||
import io.github.dsheirer.preference.UserPreferences;
|
import io.github.dsheirer.preference.UserPreferences;
|
||||||
import io.github.dsheirer.preference.playlist.PlaylistPreference;
|
import io.github.dsheirer.preference.playlist.PlaylistPreference;
|
||||||
import io.github.dsheirer.sample.Listener;
|
import io.github.dsheirer.sample.Listener;
|
||||||
import io.github.dsheirer.service.radioreference.AliasListSynchronizer;
|
|
||||||
import io.github.dsheirer.service.radioreference.RadioReference;
|
import io.github.dsheirer.service.radioreference.RadioReference;
|
||||||
import io.github.dsheirer.source.tuner.manager.TunerManager;
|
import io.github.dsheirer.source.tuner.manager.TunerManager;
|
||||||
import io.github.dsheirer.util.ThreadPool;
|
import io.github.dsheirer.util.ThreadPool;
|
||||||
@@ -78,7 +76,6 @@ public class PlaylistManager implements Listener<ChannelEvent>
|
|||||||
private TunerManager mTunerManager;
|
private TunerManager mTunerManager;
|
||||||
private UserPreferences mUserPreferences;
|
private UserPreferences mUserPreferences;
|
||||||
private RadioReference mRadioReference;
|
private RadioReference mRadioReference;
|
||||||
private AliasListSynchronizer mAliasListSynchronizer;
|
|
||||||
private AtomicBoolean mPlaylistSavePending = new AtomicBoolean();
|
private AtomicBoolean mPlaylistSavePending = new AtomicBoolean();
|
||||||
private ScheduledFuture<?> mPlaylistSaveFuture;
|
private ScheduledFuture<?> mPlaylistSaveFuture;
|
||||||
private boolean mPlaylistLoading = false;
|
private boolean mPlaylistLoading = false;
|
||||||
@@ -106,7 +103,6 @@ public class PlaylistManager implements Listener<ChannelEvent>
|
|||||||
|
|
||||||
mBroadcastModel = new BroadcastModel(mAliasModel, mIconModel, userPreferences);
|
mBroadcastModel = new BroadcastModel(mAliasModel, mIconModel, userPreferences);
|
||||||
mRadioReference = new RadioReference(mUserPreferences);
|
mRadioReference = new RadioReference(mUserPreferences);
|
||||||
mAliasListSynchronizer = new AliasListSynchronizer(mAliasModel, mRadioReference, mUserPreferences);
|
|
||||||
|
|
||||||
mChannelModel = new ChannelModel(mAliasModel);
|
mChannelModel = new ChannelModel(mAliasModel);
|
||||||
mChannelProcessingManager = new ChannelProcessingManager(mChannelMapModel, eventLogManager, mTunerManager,
|
mChannelProcessingManager = new ChannelProcessingManager(mChannelMapModel, eventLogManager, mTunerManager,
|
||||||
@@ -124,8 +120,6 @@ public class PlaylistManager implements Listener<ChannelEvent>
|
|||||||
mChannelModel.addListener(this);
|
mChannelModel.addListener(this);
|
||||||
|
|
||||||
mAliasModel.aliasList().addListener((ListChangeListener<Alias>)c -> schedulePlaylistSave());
|
mAliasModel.aliasList().addListener((ListChangeListener<Alias>)c -> schedulePlaylistSave());
|
||||||
mAliasModel.aliasListConfigurations()
|
|
||||||
.addListener((ListChangeListener<AliasListConfiguration>)c -> schedulePlaylistSave());
|
|
||||||
|
|
||||||
mChannelMapModel.getChannelMaps().addListener((ListChangeListener<ChannelMap>)c -> schedulePlaylistSave());
|
mChannelMapModel.getChannelMaps().addListener((ListChangeListener<ChannelMap>)c -> schedulePlaylistSave());
|
||||||
|
|
||||||
@@ -254,14 +248,6 @@ public class PlaylistManager implements Listener<ChannelEvent>
|
|||||||
return mBroadcastModel;
|
return mBroadcastModel;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Synchronizer for alias lists that track a Radio Reference system.
|
|
||||||
*/
|
|
||||||
public AliasListSynchronizer getAliasListSynchronizer()
|
|
||||||
{
|
|
||||||
return mAliasListSynchronizer;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Channel Map model managed by this playlist manager
|
* Channel Map model managed by this playlist manager
|
||||||
*/
|
*/
|
||||||
@@ -278,7 +264,6 @@ public class PlaylistManager implements Listener<ChannelEvent>
|
|||||||
{
|
{
|
||||||
PlaylistV2 playlist = load();
|
PlaylistV2 playlist = load();
|
||||||
transferPlaylistToModels(playlist);
|
transferPlaylistToModels(playlist);
|
||||||
mAliasListSynchronizer.start();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -416,7 +401,6 @@ public class PlaylistManager implements Listener<ChannelEvent>
|
|||||||
mPlaylistLoading = true;
|
mPlaylistLoading = true;
|
||||||
|
|
||||||
mAliasModel.addAliases(playlist.getAliases());
|
mAliasModel.addAliases(playlist.getAliases());
|
||||||
mAliasModel.addAliasListConfigurations(playlist.getAliasListConfigurations());
|
|
||||||
|
|
||||||
|
|
||||||
mBroadcastModel.addBroadcastConfigurations(playlist.getBroadcastConfigurations());
|
mBroadcastModel.addBroadcastConfigurations(playlist.getBroadcastConfigurations());
|
||||||
@@ -461,7 +445,6 @@ public class PlaylistManager implements Listener<ChannelEvent>
|
|||||||
PlaylistV2 playlist = new PlaylistV2();
|
PlaylistV2 playlist = new PlaylistV2();
|
||||||
|
|
||||||
playlist.setAliases(new ArrayList(mAliasModel.getAliases()));
|
playlist.setAliases(new ArrayList(mAliasModel.getAliases()));
|
||||||
playlist.setAliasListConfigurations(new ArrayList<>(mAliasModel.aliasListConfigurations()));
|
|
||||||
playlist.setBroadcastConfigurations(new ArrayList(mBroadcastModel.getBroadcastConfigurations()));
|
playlist.setBroadcastConfigurations(new ArrayList(mBroadcastModel.getBroadcastConfigurations()));
|
||||||
playlist.setChannels(new ArrayList(mChannelModel.getChannels()));
|
playlist.setChannels(new ArrayList(mChannelModel.getChannels()));
|
||||||
playlist.setChannelMaps(new ArrayList(mChannelMapModel.getChannelMaps()));
|
playlist.setChannelMaps(new ArrayList(mChannelMapModel.getChannelMaps()));
|
||||||
|
|||||||
@@ -24,7 +24,6 @@ package io.github.dsheirer.playlist;
|
|||||||
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
|
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
|
||||||
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
|
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
|
||||||
import io.github.dsheirer.alias.Alias;
|
import io.github.dsheirer.alias.Alias;
|
||||||
import io.github.dsheirer.alias.AliasListConfiguration;
|
|
||||||
import io.github.dsheirer.audio.broadcast.BroadcastConfiguration;
|
import io.github.dsheirer.audio.broadcast.BroadcastConfiguration;
|
||||||
import io.github.dsheirer.controller.channel.Channel;
|
import io.github.dsheirer.controller.channel.Channel;
|
||||||
import io.github.dsheirer.controller.channel.map.ChannelMap;
|
import io.github.dsheirer.controller.channel.map.ChannelMap;
|
||||||
@@ -37,7 +36,6 @@ public class PlaylistV2
|
|||||||
{
|
{
|
||||||
private int mVersion = PlaylistManager.PLAYLIST_CURRENT_VERSION;
|
private int mVersion = PlaylistManager.PLAYLIST_CURRENT_VERSION;
|
||||||
private List<Alias> mAliases = new ArrayList<>();
|
private List<Alias> mAliases = new ArrayList<>();
|
||||||
private List<AliasListConfiguration> mAliasListConfigurations = new ArrayList<>();
|
|
||||||
private List<BroadcastConfiguration> mBroadcastConfigurations = new ArrayList<>();
|
private List<BroadcastConfiguration> mBroadcastConfigurations = new ArrayList<>();
|
||||||
private List<Channel> mChannels = new ArrayList<>();
|
private List<Channel> mChannels = new ArrayList<>();
|
||||||
private List<ChannelMap> mChannelMaps = new ArrayList<>();
|
private List<ChannelMap> mChannelMaps = new ArrayList<>();
|
||||||
@@ -74,20 +72,6 @@ public class PlaylistV2
|
|||||||
mAliases = aliases;
|
mAliases = aliases;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Alias list settings, like Radio Reference system tracking. Older playlists don't have these.
|
|
||||||
*/
|
|
||||||
@JacksonXmlProperty(isAttribute = false, localName = "alias_list")
|
|
||||||
public List<AliasListConfiguration> getAliasListConfigurations()
|
|
||||||
{
|
|
||||||
return mAliasListConfigurations;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setAliasListConfigurations(List<AliasListConfiguration> configurations)
|
|
||||||
{
|
|
||||||
mAliasListConfigurations = configurations != null ? configurations : new ArrayList<>();
|
|
||||||
}
|
|
||||||
|
|
||||||
@JacksonXmlProperty(isAttribute = false, localName = "channel")
|
@JacksonXmlProperty(isAttribute = false, localName = "channel")
|
||||||
public List<Channel> getChannels()
|
public List<Channel> getChannels()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -40,21 +40,9 @@ public class MapPreference extends Preference
|
|||||||
*/
|
*/
|
||||||
public static final int DEFAULT_ZOOM = 7;
|
public static final int DEFAULT_ZOOM = 7;
|
||||||
|
|
||||||
/**
|
|
||||||
* Range of OpenStreetMap tile zoom levels the map shows
|
|
||||||
*/
|
|
||||||
public static final int MINIMUM_TILE_ZOOM = 2;
|
|
||||||
public static final int MAXIMUM_TILE_ZOOM = 19;
|
|
||||||
/**
|
|
||||||
* Tile zoom level plus the stored zoom level, for the original Swing map viewer's inverted zoom scale
|
|
||||||
*/
|
|
||||||
private static final int TILE_ZOOM_OFFSET = 19;
|
|
||||||
private static final String CENTER = "center";
|
private static final String CENTER = "center";
|
||||||
private static final String ZOOM = "zoom";
|
private static final String ZOOM = "zoom";
|
||||||
private static final String SHOW_RADIO_REFERENCE_SITES = "show.radioreference.sites";
|
private static final String SHOW_RADIO_REFERENCE_SITES = "show.radioreference.sites";
|
||||||
private static final String TILE_SERVER = "tile.server";
|
|
||||||
private static final String TILE_SERVER_KEY = "tile.server.key.";
|
|
||||||
private static final String TILE_STYLE = "tile.style";
|
|
||||||
private final Preferences mPreferences = Preferences.userNodeForPackage(MapPreference.class);
|
private final Preferences mPreferences = Preferences.userNodeForPackage(MapPreference.class);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -157,27 +145,6 @@ public class MapPreference extends Preference
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Last zoom level of the map as an OpenStreetMap tile zoom level, where 0 shows the whole world in one tile and
|
|
||||||
* higher levels are closer. The stored zoom level uses the inverted scale of the original Swing map viewer,
|
|
||||||
* where the tile zoom level is {@link #TILE_ZOOM_OFFSET} minus the stored level, so existing views carry over.
|
|
||||||
* Can be called from any thread.
|
|
||||||
* @return tile zoom level, {@link #MINIMUM_TILE_ZOOM} to {@link #MAXIMUM_TILE_ZOOM}
|
|
||||||
*/
|
|
||||||
public int getTileZoom()
|
|
||||||
{
|
|
||||||
return Math.clamp(TILE_ZOOM_OFFSET - getZoom(), MINIMUM_TILE_ZOOM, MAXIMUM_TILE_ZOOM);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Stores the zoom level of the map as an OpenStreetMap tile zoom level
|
|
||||||
* @param tileZoom level, clamped to {@link #MINIMUM_TILE_ZOOM} to {@link #MAXIMUM_TILE_ZOOM}
|
|
||||||
*/
|
|
||||||
public void setTileZoom(int tileZoom)
|
|
||||||
{
|
|
||||||
setZoom(TILE_ZOOM_OFFSET - Math.clamp(tileZoom, MINIMUM_TILE_ZOOM, MAXIMUM_TILE_ZOOM));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Indicates if the map shows the radio reference trunked system sites near the user
|
* Indicates if the map shows the radio reference trunked system sites near the user
|
||||||
*/
|
*/
|
||||||
@@ -198,82 +165,6 @@ public class MapPreference extends Preference
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Identifier of the map tile server
|
|
||||||
* @return identifier, or null when none was chosen
|
|
||||||
*/
|
|
||||||
public String getTileServer()
|
|
||||||
{
|
|
||||||
return mPreferences.get(TILE_SERVER, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Stores the identifier of the map tile server
|
|
||||||
*/
|
|
||||||
public void setTileServer(String id)
|
|
||||||
{
|
|
||||||
if(id != null && !id.equals(getTileServer()))
|
|
||||||
{
|
|
||||||
mPreferences.put(TILE_SERVER, id);
|
|
||||||
notifyPreferenceUpdated();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Style of the map tiles: following the theme, light or dark
|
|
||||||
* @return style name, or null when none was chosen
|
|
||||||
*/
|
|
||||||
public String getTileStyle()
|
|
||||||
{
|
|
||||||
return mPreferences.get(TILE_STYLE, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Stores the style of the map tiles
|
|
||||||
*/
|
|
||||||
public void setTileStyle(String style)
|
|
||||||
{
|
|
||||||
if(style != null && !style.equals(getTileStyle()))
|
|
||||||
{
|
|
||||||
mPreferences.put(TILE_STYLE, style);
|
|
||||||
notifyPreferenceUpdated();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Key the user entered for a map tile server that needs one
|
|
||||||
* @param id of the tile server
|
|
||||||
* @return key, or null
|
|
||||||
*/
|
|
||||||
public String getTileServerKey(String id)
|
|
||||||
{
|
|
||||||
return mPreferences.get(TILE_SERVER_KEY + id, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Stores the key for a map tile server, or removes it when it's blank
|
|
||||||
* @param id of the tile server
|
|
||||||
* @param key for the server, or null
|
|
||||||
*/
|
|
||||||
public void setTileServerKey(String id, String key)
|
|
||||||
{
|
|
||||||
String value = key != null && !key.isBlank() ? key.strip() : null;
|
|
||||||
|
|
||||||
if(!Objects.equals(value, getTileServerKey(id)))
|
|
||||||
{
|
|
||||||
if(value != null)
|
|
||||||
{
|
|
||||||
mPreferences.put(TILE_SERVER_KEY + id, value);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
mPreferences.remove(TILE_SERVER_KEY + id);
|
|
||||||
}
|
|
||||||
|
|
||||||
notifyPreferenceUpdated();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Moves the map view stored in the settings file by older versions of the application into this preference.
|
* Moves the map view stored in the settings file by older versions of the application into this preference.
|
||||||
* Does nothing once a center point is stored here.
|
* Does nothing once a center point is stored here.
|
||||||
|
|||||||
@@ -60,7 +60,6 @@ public class RadioReferencePreference extends Preference
|
|||||||
private static final String ENCRYPTED_TALKGROUP_DO_NOT_MONITOR = "encrypted.talkgroup.import.do.not.monitor";
|
private static final String ENCRYPTED_TALKGROUP_DO_NOT_MONITOR = "encrypted.talkgroup.import.do.not.monitor";
|
||||||
private static final String CREATE_AND_SHOW_CHANNEL_EDITOR = "create.and.show.channel.editor";
|
private static final String CREATE_AND_SHOW_CHANNEL_EDITOR = "create.and.show.channel.editor";
|
||||||
private static final String LOCATION = "location";
|
private static final String LOCATION = "location";
|
||||||
private static final String ALIAS_LIST_UPDATE_INTERVAL = "alias.list.update.interval";
|
|
||||||
private static final String LOCATION_LABEL = "location.label";
|
private static final String LOCATION_LABEL = "location.label";
|
||||||
|
|
||||||
private String mUserName;
|
private String mUserName;
|
||||||
@@ -72,7 +71,6 @@ public class RadioReferencePreference extends Preference
|
|||||||
private Boolean mShowChannelEditorCounty;
|
private Boolean mShowChannelEditorCounty;
|
||||||
private Boolean mEncryptedTalkgroupImport;
|
private Boolean mEncryptedTalkgroupImport;
|
||||||
private Boolean mCreateAndShowChannelEditor;
|
private Boolean mCreateAndShowChannelEditor;
|
||||||
private AliasListUpdateInterval mAliasListUpdateInterval;
|
|
||||||
private int mPreferredCountryId = INVALID_ID;
|
private int mPreferredCountryId = INVALID_ID;
|
||||||
private int mPreferredStateId = INVALID_ID;
|
private int mPreferredStateId = INVALID_ID;
|
||||||
private int mPreferredCountyId = INVALID_ID;
|
private int mPreferredCountyId = INVALID_ID;
|
||||||
@@ -496,41 +494,6 @@ public class RadioReferencePreference extends Preference
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* How often alias lists that track a Radio Reference system check the system for changes.
|
|
||||||
*/
|
|
||||||
public AliasListUpdateInterval getAliasListUpdateInterval()
|
|
||||||
{
|
|
||||||
if(mAliasListUpdateInterval == null)
|
|
||||||
{
|
|
||||||
String name = mPreferences.get(ALIAS_LIST_UPDATE_INTERVAL, AliasListUpdateInterval.DAILY.name());
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
mAliasListUpdateInterval = AliasListUpdateInterval.valueOf(name);
|
|
||||||
}
|
|
||||||
catch(IllegalArgumentException iae)
|
|
||||||
{
|
|
||||||
mAliasListUpdateInterval = AliasListUpdateInterval.DAILY;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return mAliasListUpdateInterval;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets how often alias lists that track a Radio Reference system check the system for changes.
|
|
||||||
*/
|
|
||||||
public void setAliasListUpdateInterval(AliasListUpdateInterval interval)
|
|
||||||
{
|
|
||||||
if(interval != null)
|
|
||||||
{
|
|
||||||
mAliasListUpdateInterval = interval;
|
|
||||||
mPreferences.put(ALIAS_LIST_UPDATE_INTERVAL, interval.name());
|
|
||||||
notifyPreferenceUpdated();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Indicates if should show channel editor after trunked channel configuration create
|
* Indicates if should show channel editor after trunked channel configuration create
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -1,510 +0,0 @@
|
|||||||
/*
|
|
||||||
* *****************************************************************************
|
|
||||||
* Copyright (C) 2014-2026 Dennis Sheirer
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
|
||||||
* ****************************************************************************
|
|
||||||
*/
|
|
||||||
|
|
||||||
package io.github.dsheirer.service.radioreference;
|
|
||||||
|
|
||||||
import com.google.common.annotations.VisibleForTesting;
|
|
||||||
import io.github.dsheirer.alias.Alias;
|
|
||||||
import io.github.dsheirer.alias.AliasListConfiguration;
|
|
||||||
import io.github.dsheirer.alias.AliasModel;
|
|
||||||
import io.github.dsheirer.alias.id.AliasID;
|
|
||||||
import io.github.dsheirer.gui.playlist.radioreference.RadioReferenceDecoder;
|
|
||||||
import io.github.dsheirer.gui.playlist.radioreference.TalkgroupEncryption;
|
|
||||||
import io.github.dsheirer.preference.UserPreferences;
|
|
||||||
import io.github.dsheirer.preference.radioreference.AliasListUpdateInterval;
|
|
||||||
import io.github.dsheirer.rrapi.RadioReferenceException;
|
|
||||||
import io.github.dsheirer.rrapi.RadioReferenceService;
|
|
||||||
import io.github.dsheirer.rrapi.type.System;
|
|
||||||
import io.github.dsheirer.rrapi.type.SystemInformation;
|
|
||||||
import io.github.dsheirer.rrapi.type.Talkgroup;
|
|
||||||
import io.github.dsheirer.rrapi.type.TalkgroupCategory;
|
|
||||||
import io.github.dsheirer.util.ThreadPool;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Date;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Objects;
|
|
||||||
import java.util.concurrent.CompletableFuture;
|
|
||||||
import java.util.concurrent.ScheduledFuture;
|
|
||||||
import java.util.concurrent.TimeUnit;
|
|
||||||
import javafx.application.Platform;
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Keeps alias lists that track a Radio Reference system up to date. Checks each tracked system on the interval from
|
|
||||||
* the user's Radio Reference preferences, records the system's Radio Reference last updated timestamp, and when the
|
|
||||||
* alias list is set to auto-update and the system changed, adds an alias for each new talkgroup and updates the name
|
|
||||||
* and group of aliases for talkgroups that changed on Radio Reference since the last synchronization.
|
|
||||||
*
|
|
||||||
* Aliases for talkgroups that are removed from Radio Reference are left in place, and alias settings other than the
|
|
||||||
* name and group (color, icon, priority, record, stream, etc.) are never changed.
|
|
||||||
*/
|
|
||||||
public class AliasListSynchronizer
|
|
||||||
{
|
|
||||||
private static final Logger mLog = LoggerFactory.getLogger(AliasListSynchronizer.class);
|
|
||||||
private static final long CHECK_PERIOD_MINUTES = 30;
|
|
||||||
private static final long INITIAL_DELAY_MINUTES = 2;
|
|
||||||
private static final long RETRY_AFTER_FAILURE_MS = TimeUnit.HOURS.toMillis(1);
|
|
||||||
|
|
||||||
private final AliasModel mAliasModel;
|
|
||||||
private final RadioReference mRadioReference;
|
|
||||||
private final UserPreferences mUserPreferences;
|
|
||||||
private final Object mSynchronizationLock = new Object();
|
|
||||||
private final Map<Integer,Long> mFailedAttempts = new HashMap<>();
|
|
||||||
private RadioReferenceDecoder mRadioReferenceDecoder;
|
|
||||||
private ScheduledFuture<?> mScheduledCheck;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Constructs an instance
|
|
||||||
* @param aliasModel containing aliases and alias list configurations
|
|
||||||
* @param radioReference for access to the web service
|
|
||||||
* @param userPreferences for the update interval and encrypted talkgroup import preferences
|
|
||||||
*/
|
|
||||||
public AliasListSynchronizer(AliasModel aliasModel, RadioReference radioReference, UserPreferences userPreferences)
|
|
||||||
{
|
|
||||||
mAliasModel = aliasModel;
|
|
||||||
mRadioReference = radioReference;
|
|
||||||
mUserPreferences = userPreferences;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Starts periodic checks of tracked alias lists.
|
|
||||||
*/
|
|
||||||
public synchronized void start()
|
|
||||||
{
|
|
||||||
if(mScheduledCheck == null)
|
|
||||||
{
|
|
||||||
mScheduledCheck = ThreadPool.SCHEDULED.scheduleAtFixedRate(this::checkDueAliasLists,
|
|
||||||
INITIAL_DELAY_MINUTES, CHECK_PERIOD_MINUTES, TimeUnit.MINUTES);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Stops periodic checks.
|
|
||||||
*/
|
|
||||||
public synchronized void stop()
|
|
||||||
{
|
|
||||||
if(mScheduledCheck != null)
|
|
||||||
{
|
|
||||||
mScheduledCheck.cancel(false);
|
|
||||||
mScheduledCheck = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Checks each tracked alias list whose last check is older than the preferred update interval. Runs on a
|
|
||||||
* scheduler thread.
|
|
||||||
*/
|
|
||||||
private void checkDueAliasLists()
|
|
||||||
{
|
|
||||||
if(!mUserPreferences.getRadioReferencePreference().hasStoredCredentials())
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
AliasListUpdateInterval interval = mUserPreferences.getRadioReferencePreference().getAliasListUpdateInterval();
|
|
||||||
long now = java.lang.System.currentTimeMillis();
|
|
||||||
|
|
||||||
for(AliasListConfiguration configuration: getTrackedConfigurations())
|
|
||||||
{
|
|
||||||
boolean due = now - configuration.getLastChecked() >= interval.getInterval().toMillis();
|
|
||||||
|
|
||||||
Long failed;
|
|
||||||
synchronized(mFailedAttempts)
|
|
||||||
{
|
|
||||||
failed = mFailedAttempts.get(configuration.getRadioReferenceSystemId());
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean retryWait = failed != null && now - failed < RETRY_AFTER_FAILURE_MS;
|
|
||||||
|
|
||||||
if(due && !retryWait)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
synchronize(configuration, false).join();
|
|
||||||
}
|
|
||||||
catch(Exception e)
|
|
||||||
{
|
|
||||||
mLog.warn("Unable to check Radio Reference system [" + configuration.getRadioReferenceSystemId() +
|
|
||||||
"] for alias list [" + configuration.getName() + "] - " + getMessage(e));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Snapshot of the alias list configurations that track a Radio Reference system.
|
|
||||||
*/
|
|
||||||
private List<AliasListConfiguration> getTrackedConfigurations()
|
|
||||||
{
|
|
||||||
List<AliasListConfiguration> tracked = new ArrayList<>();
|
|
||||||
|
|
||||||
//The configuration list is modified on the FX thread, so retry on a concurrent change
|
|
||||||
for(int attempt = 0; attempt < 3; attempt++)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
tracked.clear();
|
|
||||||
|
|
||||||
for(AliasListConfiguration configuration: new ArrayList<>(mAliasModel.aliasListConfigurations()))
|
|
||||||
{
|
|
||||||
if(configuration.isTrackingRadioReferenceSystem())
|
|
||||||
{
|
|
||||||
tracked.add(configuration);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return tracked;
|
|
||||||
}
|
|
||||||
catch(Exception e)
|
|
||||||
{
|
|
||||||
//Try again
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return tracked;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Refreshes the alias list now: reads the current system and talkgroups from Radio Reference and adds or updates
|
|
||||||
* aliases, regardless of the alias list's auto-update setting.
|
|
||||||
* @param configuration of a tracked alias list
|
|
||||||
* @return future result, completed after the aliases are updated on the FX thread
|
|
||||||
*/
|
|
||||||
public CompletableFuture<Result> refresh(AliasListConfiguration configuration)
|
|
||||||
{
|
|
||||||
return synchronize(configuration, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Checks the tracked system and, when forced or when the alias list auto-updates and the system changed,
|
|
||||||
* synchronizes the talkgroup aliases.
|
|
||||||
* @param configuration of the tracked alias list
|
|
||||||
* @param force true to synchronize regardless of the auto-update setting or the last updated timestamps
|
|
||||||
* @return future result
|
|
||||||
*/
|
|
||||||
private CompletableFuture<Result> synchronize(AliasListConfiguration configuration, boolean force)
|
|
||||||
{
|
|
||||||
CompletableFuture<Result> future = new CompletableFuture<>();
|
|
||||||
|
|
||||||
if(configuration == null || !configuration.isTrackingRadioReferenceSystem())
|
|
||||||
{
|
|
||||||
future.completeExceptionally(new IllegalArgumentException("Alias list doesn't track a Radio Reference system"));
|
|
||||||
return future;
|
|
||||||
}
|
|
||||||
|
|
||||||
ThreadPool.CACHED.execute(() -> {
|
|
||||||
//One synchronization at a time so that a manual refresh and a scheduled check can't both add aliases
|
|
||||||
synchronized(mSynchronizationLock)
|
|
||||||
{
|
|
||||||
int systemId = configuration.getRadioReferenceSystemId();
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
RadioReferenceService service = mRadioReference.getService();
|
|
||||||
|
|
||||||
if(service instanceof CachingRadioReferenceService caching)
|
|
||||||
{
|
|
||||||
caching.invalidateSystem(systemId);
|
|
||||||
}
|
|
||||||
|
|
||||||
SystemInformation systemInformation = service.getSystemInformation(systemId);
|
|
||||||
|
|
||||||
if(systemInformation == null)
|
|
||||||
{
|
|
||||||
throw new RadioReferenceException("Radio Reference didn't provide system [" + systemId + "]");
|
|
||||||
}
|
|
||||||
|
|
||||||
long lastUpdated = getTime(systemInformation.getLastUpdated());
|
|
||||||
boolean changed = lastUpdated > configuration.getSynchronizedLastUpdated();
|
|
||||||
boolean synchronize = force || (configuration.isAutoUpdate() && changed);
|
|
||||||
|
|
||||||
List<Talkgroup> talkgroups = null;
|
|
||||||
Map<Integer,String> categoryNames = new HashMap<>();
|
|
||||||
System system = null;
|
|
||||||
RadioReferenceDecoder decoder = null;
|
|
||||||
|
|
||||||
if(synchronize)
|
|
||||||
{
|
|
||||||
decoder = getRadioReferenceDecoder();
|
|
||||||
system = toSystem(systemId, systemInformation);
|
|
||||||
talkgroups = service.getTalkgroups(systemId);
|
|
||||||
|
|
||||||
List<TalkgroupCategory> categories = service.getTalkgroupCategories(systemId);
|
|
||||||
|
|
||||||
if(categories != null)
|
|
||||||
{
|
|
||||||
for(TalkgroupCategory category: categories)
|
|
||||||
{
|
|
||||||
categoryNames.put(category.getTalkgroupCategoryId(), category.getName());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
synchronized(mFailedAttempts)
|
|
||||||
{
|
|
||||||
mFailedAttempts.remove(systemId);
|
|
||||||
}
|
|
||||||
|
|
||||||
List<Talkgroup> talkgroupsToApply = talkgroups;
|
|
||||||
System systemToApply = system;
|
|
||||||
RadioReferenceDecoder decoderToApply = decoder;
|
|
||||||
String systemName = systemInformation.getName();
|
|
||||||
|
|
||||||
runOnFxThread(() -> {
|
|
||||||
try
|
|
||||||
{
|
|
||||||
future.complete(apply(configuration, systemId, systemName, lastUpdated, talkgroupsToApply,
|
|
||||||
categoryNames, systemToApply, decoderToApply));
|
|
||||||
}
|
|
||||||
catch(Throwable t)
|
|
||||||
{
|
|
||||||
future.completeExceptionally(t);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
catch(Throwable t)
|
|
||||||
{
|
|
||||||
synchronized(mFailedAttempts)
|
|
||||||
{
|
|
||||||
mFailedAttempts.put(systemId, java.lang.System.currentTimeMillis());
|
|
||||||
}
|
|
||||||
|
|
||||||
future.completeExceptionally(t);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
return future;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Records the check and applies the talkgroups to the alias list. Runs on the FX thread.
|
|
||||||
* @param talkgroups to apply, or null when only recording the check
|
|
||||||
*/
|
|
||||||
@VisibleForTesting
|
|
||||||
Result apply(AliasListConfiguration configuration, int systemId, String systemName, long lastUpdated,
|
|
||||||
List<Talkgroup> talkgroups, Map<Integer,String> categoryNames, System system,
|
|
||||||
RadioReferenceDecoder decoder)
|
|
||||||
{
|
|
||||||
//The user may have deleted the alias list or stopped tracking while the request was in progress
|
|
||||||
if(!mAliasModel.aliasListConfigurations().contains(configuration) || !configuration.isTracking(systemId))
|
|
||||||
{
|
|
||||||
return new Result(false, 0, 0, lastUpdated);
|
|
||||||
}
|
|
||||||
|
|
||||||
configuration.setLastChecked(java.lang.System.currentTimeMillis());
|
|
||||||
configuration.setRadioReferenceLastUpdated(lastUpdated);
|
|
||||||
|
|
||||||
if(systemName != null && !systemName.isEmpty())
|
|
||||||
{
|
|
||||||
configuration.setRadioReferenceSystemName(systemName);
|
|
||||||
}
|
|
||||||
|
|
||||||
if(talkgroups == null)
|
|
||||||
{
|
|
||||||
return new Result(false, 0, 0, lastUpdated);
|
|
||||||
}
|
|
||||||
|
|
||||||
String aliasListName = configuration.getName();
|
|
||||||
long previousSynchronization = configuration.getSynchronizedLastUpdated();
|
|
||||||
boolean encryptedDoNotMonitor = mUserPreferences.getRadioReferencePreference().isEncryptedTalkgroupDoNotMonitor();
|
|
||||||
|
|
||||||
List<Alias> listAliases = new ArrayList<>();
|
|
||||||
|
|
||||||
for(Alias alias: mAliasModel.getAliases())
|
|
||||||
{
|
|
||||||
if(aliasListName.equals(alias.getAliasListName()))
|
|
||||||
{
|
|
||||||
listAliases.add(alias);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
List<Alias> created = new ArrayList<>();
|
|
||||||
int updated = 0;
|
|
||||||
|
|
||||||
for(Talkgroup talkgroup: talkgroups)
|
|
||||||
{
|
|
||||||
io.github.dsheirer.alias.id.talkgroup.Talkgroup aliasId = decoder.getTalkgroupAliasId(talkgroup, system);
|
|
||||||
String group = categoryNames.get(talkgroup.getTalkgroupCategoryId());
|
|
||||||
List<Alias> matches = getMatches(listAliases, aliasId);
|
|
||||||
|
|
||||||
if(matches.isEmpty())
|
|
||||||
{
|
|
||||||
Alias alias = decoder.createAlias(talkgroup, system, aliasListName, group);
|
|
||||||
|
|
||||||
if(encryptedDoNotMonitor &&
|
|
||||||
TalkgroupEncryption.lookup(talkgroup.getEncryptionState()) == TalkgroupEncryption.FULL)
|
|
||||||
{
|
|
||||||
alias.addAliasID(new io.github.dsheirer.alias.id.priority.Priority(
|
|
||||||
io.github.dsheirer.alias.id.priority.Priority.DO_NOT_MONITOR));
|
|
||||||
}
|
|
||||||
|
|
||||||
created.add(alias);
|
|
||||||
listAliases.add(alias);
|
|
||||||
}
|
|
||||||
//Only update aliases for talkgroups that changed on Radio Reference after the previous synchronization, so
|
|
||||||
//that the first synchronization and unchanged talkgroups keep any names the user has edited.
|
|
||||||
else if(previousSynchronization > 0 && getTime(talkgroup.getLastUpdated()) > previousSynchronization)
|
|
||||||
{
|
|
||||||
for(Alias alias: matches)
|
|
||||||
{
|
|
||||||
boolean aliasUpdated = false;
|
|
||||||
String name = talkgroup.getAlphaTag();
|
|
||||||
|
|
||||||
if(name != null && !name.isEmpty() && !Objects.equals(name, alias.getName()))
|
|
||||||
{
|
|
||||||
alias.setName(name);
|
|
||||||
aliasUpdated = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(group != null && !group.isEmpty() && !Objects.equals(group, alias.getGroup()))
|
|
||||||
{
|
|
||||||
alias.setGroup(group);
|
|
||||||
aliasUpdated = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(aliasUpdated)
|
|
||||||
{
|
|
||||||
updated++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(!created.isEmpty())
|
|
||||||
{
|
|
||||||
mAliasModel.addAliases(created);
|
|
||||||
}
|
|
||||||
|
|
||||||
configuration.setSynchronizedLastUpdated(lastUpdated);
|
|
||||||
|
|
||||||
mLog.info("Alias list [" + aliasListName + "] synchronized with Radio Reference system [" +
|
|
||||||
configuration.getRadioReferenceSystemId() + "] - added [" + created.size() + "] updated [" + updated +
|
|
||||||
"] aliases");
|
|
||||||
|
|
||||||
return new Result(true, created.size(), updated, lastUpdated);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Aliases with a talkgroup alias identifier that matches the talkgroup.
|
|
||||||
*/
|
|
||||||
private static List<Alias> getMatches(List<Alias> aliases, io.github.dsheirer.alias.id.talkgroup.Talkgroup aliasId)
|
|
||||||
{
|
|
||||||
List<Alias> matches = new ArrayList<>();
|
|
||||||
|
|
||||||
for(Alias alias: aliases)
|
|
||||||
{
|
|
||||||
for(AliasID id: alias.getAliasIdentifiers())
|
|
||||||
{
|
|
||||||
if(aliasId.matches(id))
|
|
||||||
{
|
|
||||||
matches.add(alias);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return matches;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Decoder for talkgroup values and protocols, created on first use from the cached Radio Reference maps.
|
|
||||||
*/
|
|
||||||
private RadioReferenceDecoder getRadioReferenceDecoder() throws RadioReferenceException
|
|
||||||
{
|
|
||||||
if(mRadioReferenceDecoder == null)
|
|
||||||
{
|
|
||||||
RadioReferenceService service = mRadioReference.getService();
|
|
||||||
mRadioReferenceDecoder = new RadioReferenceDecoder(mUserPreferences, service.getTypesMap(),
|
|
||||||
service.getFlavorsMap(), service.getVoicesMap(), service.getTagsMap());
|
|
||||||
}
|
|
||||||
|
|
||||||
return mRadioReferenceDecoder;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a system from the system information, for the decoder's protocol lookup.
|
|
||||||
*/
|
|
||||||
private static System toSystem(int systemId, SystemInformation systemInformation)
|
|
||||||
{
|
|
||||||
System system = new System();
|
|
||||||
system.setSystemId(systemId);
|
|
||||||
system.setName(systemInformation.getName());
|
|
||||||
system.setTypeId(systemInformation.getTypeId());
|
|
||||||
system.setFlavorId(systemInformation.getFlavorId());
|
|
||||||
system.setVoiceId(systemInformation.getVoiceId());
|
|
||||||
system.setCity(systemInformation.getCity());
|
|
||||||
system.setLastUpdated(systemInformation.getLastUpdated());
|
|
||||||
return system;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static long getTime(Date date)
|
|
||||||
{
|
|
||||||
return date != null ? date.getTime() : 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Runs on the FX thread, or on this thread when the FX toolkit isn't running (headless).
|
|
||||||
*/
|
|
||||||
private static void runOnFxThread(Runnable runnable)
|
|
||||||
{
|
|
||||||
if(Platform.isFxApplicationThread())
|
|
||||||
{
|
|
||||||
runnable.run();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
Platform.runLater(runnable);
|
|
||||||
}
|
|
||||||
catch(IllegalStateException ise)
|
|
||||||
{
|
|
||||||
runnable.run();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Message for an exception, unwrapping completion exceptions.
|
|
||||||
*/
|
|
||||||
public static String getMessage(Throwable throwable)
|
|
||||||
{
|
|
||||||
Throwable cause = throwable;
|
|
||||||
|
|
||||||
while(cause.getCause() != null && (cause instanceof java.util.concurrent.CompletionException ||
|
|
||||||
cause instanceof java.util.concurrent.ExecutionException))
|
|
||||||
{
|
|
||||||
cause = cause.getCause();
|
|
||||||
}
|
|
||||||
|
|
||||||
return cause.getMessage() != null ? cause.getMessage() : cause.getClass().getSimpleName();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Synchronization result
|
|
||||||
* @param applied true if the talkgroups were applied to the alias list
|
|
||||||
* @param added alias count
|
|
||||||
* @param updated alias count
|
|
||||||
* @param lastUpdated Radio Reference system last updated timestamp
|
|
||||||
*/
|
|
||||||
public record Result(boolean applied, int added, int updated, long lastUpdated) {}
|
|
||||||
}
|
|
||||||
@@ -148,17 +148,6 @@ public class CachingRadioReferenceService extends RadioReferenceService
|
|||||||
return get(mTalkgroupCache, systemId);
|
return get(mTalkgroupCache, systemId);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Discards the cached system information and talkgroups for the system so that the next request reads current
|
|
||||||
* values from the web service.
|
|
||||||
* @param systemId to discard
|
|
||||||
*/
|
|
||||||
public void invalidateSystem(int systemId)
|
|
||||||
{
|
|
||||||
mSystemInfoCache.invalidate(systemId);
|
|
||||||
mTalkgroupCache.invalidate(systemId);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Loads a value from the web service
|
* Loads a value from the web service
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -123,8 +123,6 @@ public class RadioReferenceFrequencyIndex
|
|||||||
});
|
});
|
||||||
private volatile NavigableMap<Long,List<FrequencyCandidate>> mFrequencies = Collections.emptyNavigableMap();
|
private volatile NavigableMap<Long,List<FrequencyCandidate>> mFrequencies = Collections.emptyNavigableMap();
|
||||||
private volatile List<SiteRecord> mSites = Collections.emptyList();
|
private volatile List<SiteRecord> mSites = Collections.emptyList();
|
||||||
//Key of the source (county:123 or agency:789) that lists each conventional frequency
|
|
||||||
private volatile Map<FrequencyCandidate,String> mSourceKeys = Collections.emptyMap();
|
|
||||||
private final List<Runnable> mUpdateListeners = new java.util.concurrent.CopyOnWriteArrayList<>();
|
private final List<Runnable> mUpdateListeners = new java.util.concurrent.CopyOnWriteArrayList<>();
|
||||||
private volatile BuildParameters mParameters;
|
private volatile BuildParameters mParameters;
|
||||||
private volatile long mRefreshed;
|
private volatile long mRefreshed;
|
||||||
@@ -310,7 +308,6 @@ public class RadioReferenceFrequencyIndex
|
|||||||
stopBuild();
|
stopBuild();
|
||||||
mFrequencies = Collections.emptyNavigableMap();
|
mFrequencies = Collections.emptyNavigableMap();
|
||||||
mSites = Collections.emptyList();
|
mSites = Collections.emptyList();
|
||||||
mSourceKeys = Collections.emptyMap();
|
|
||||||
mParameters = null;
|
mParameters = null;
|
||||||
notifyUpdated();
|
notifyUpdated();
|
||||||
setStatus("Set your location in the playlist editor's Radio Reference tab");
|
setStatus("Set your location in the playlist editor's Radio Reference tab");
|
||||||
@@ -1108,16 +1105,6 @@ public class RadioReferenceFrequencyIndex
|
|||||||
nonNull(source.candidates()).stream().anyMatch(candidate -> !candidate.isSiteFrequency()));
|
nonNull(source.candidates()).stream().anyMatch(candidate -> !candidate.isSiteFrequency()));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Key of the radio reference source that lists the conventional frequency: county:123 for a county's frequencies
|
|
||||||
* or agency:789 for an agency's frequencies. Can be called from any thread.
|
|
||||||
* @return key, or null when the index doesn't have the candidate or it's a trunked site frequency
|
|
||||||
*/
|
|
||||||
public String getSourceKey(FrequencyCandidate candidate)
|
|
||||||
{
|
|
||||||
return candidate != null ? mSourceKeys.get(candidate) : null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Site record by system and site id
|
* Site record by system and site id
|
||||||
* @return site, or null when the index doesn't have it
|
* @return site, or null when the index doesn't have it
|
||||||
@@ -1293,23 +1280,13 @@ public class RadioReferenceFrequencyIndex
|
|||||||
{
|
{
|
||||||
mFrequencies = toFrequencies(sources);
|
mFrequencies = toFrequencies(sources);
|
||||||
List<SiteRecord> sites = new ArrayList<>();
|
List<SiteRecord> sites = new ArrayList<>();
|
||||||
Map<FrequencyCandidate,String> sourceKeys = new HashMap<>();
|
|
||||||
|
|
||||||
for(Source source: sources)
|
for(Source source: sources)
|
||||||
{
|
{
|
||||||
sites.addAll(nonNull(source.sites()));
|
sites.addAll(nonNull(source.sites()));
|
||||||
|
|
||||||
if(!source.isSystem())
|
|
||||||
{
|
|
||||||
for(FrequencyCandidate candidate: nonNull(source.candidates()))
|
|
||||||
{
|
|
||||||
sourceKeys.putIfAbsent(candidate, source.key());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
mSites = Collections.unmodifiableList(sites);
|
mSites = Collections.unmodifiableList(sites);
|
||||||
mSourceKeys = Collections.unmodifiableMap(sourceKeys);
|
|
||||||
notifyUpdated();
|
notifyUpdated();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ package io.github.dsheirer.settings;
|
|||||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||||
import com.fasterxml.jackson.annotation.JsonSubTypes;
|
import com.fasterxml.jackson.annotation.JsonSubTypes;
|
||||||
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
|
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
|
||||||
import io.github.dsheirer.map.GeoPosition;
|
import org.jdesktop.swingx.mapviewer.GeoPosition;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Map view stored in the settings file by older versions of the application. Only read so that settings files from
|
* Map view stored in the settings file by older versions of the application. Only read so that settings files from
|
||||||
|
|||||||
@@ -1,206 +0,0 @@
|
|||||||
/*
|
|
||||||
* *****************************************************************************
|
|
||||||
* Copyright (C) 2014-2026 Dennis Sheirer
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
|
||||||
* ****************************************************************************
|
|
||||||
*/
|
|
||||||
|
|
||||||
package io.github.dsheirer.source.tuner;
|
|
||||||
|
|
||||||
import java.text.DecimalFormat;
|
|
||||||
import java.util.function.DoubleSupplier;
|
|
||||||
import java.util.function.Supplier;
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Lightweight sample drop detector for tuners that don't provide sample counters or hardware timestamps. Counts the
|
|
||||||
* samples delivered by the tuner and compares the count against the number of samples expected from the sample rate
|
|
||||||
* and the elapsed (host) time. Logs a warning when the tuner consistently delivers fewer samples than expected, which
|
|
||||||
* indicates that samples are being dropped (ie by the USB bus or because the host isn't keeping up).
|
|
||||||
*
|
|
||||||
* Detection: each evaluation window (5 seconds) produces a sample deficit (expected minus received). The deficit is
|
|
||||||
* accumulated with a cumulative sum that subtracts an allowance for the clock difference between the tuner and the
|
|
||||||
* host, and that never goes below zero. Buffer delivery jitter (ie a delayed buffer) adds a deficit to one window
|
|
||||||
* that the following window gives back, while dropped samples are never given back. So drops are only declared
|
|
||||||
* when the accumulated deficit exceeds the threshold at two consecutive evaluations.
|
|
||||||
*
|
|
||||||
* The stream is assumed to be stopped (ie no buffer listeners) or restarted when buffers stop arriving for longer than
|
|
||||||
* the restart gap, and detection restarts with the next buffer. Detection also restarts when the sample rate changes.
|
|
||||||
*
|
|
||||||
* Note: process() is invoked on the tuner's sample stream thread and is not thread safe.
|
|
||||||
*/
|
|
||||||
public class SampleDropMonitor
|
|
||||||
{
|
|
||||||
private static final Logger LOG = LoggerFactory.getLogger(SampleDropMonitor.class);
|
|
||||||
private static final DecimalFormat PERCENT_FORMAT = new DecimalFormat("0.00");
|
|
||||||
private static final long NANOS_PER_SECOND = 1_000_000_000L;
|
|
||||||
//Evaluation window
|
|
||||||
static final long WINDOW_NANOS = 5 * NANOS_PER_SECOND;
|
|
||||||
//Buffer arrival gap that indicates the stream was stopped and restarted
|
|
||||||
static final long RESTART_GAP_NANOS = 2 * NANOS_PER_SECOND;
|
|
||||||
//Minimum interval between warnings, so that drops are summarized instead of logged every window
|
|
||||||
static final long LOG_INTERVAL_NANOS = 60 * NANOS_PER_SECOND;
|
|
||||||
//Allowance for the tuner versus host clock difference and sample rate rounding (parts per million). Drop rates
|
|
||||||
//below this aren't detected.
|
|
||||||
static final double CLOCK_ALLOWANCE = 500.0 / 1_000_000.0;
|
|
||||||
//Accumulated deficit that indicates dropped samples, in milliseconds of samples
|
|
||||||
static final double THRESHOLD_MILLISECONDS = 20.0;
|
|
||||||
|
|
||||||
private final DoubleSupplier mSampleRateSupplier;
|
|
||||||
private final Supplier<String> mTunerNameSupplier;
|
|
||||||
private boolean mStarted = false;
|
|
||||||
private long mWindowStart;
|
|
||||||
private long mLastBuffer;
|
|
||||||
private long mLastLog;
|
|
||||||
private long mWindowSampleCount;
|
|
||||||
private double mSampleRate;
|
|
||||||
private double mAccumulatedDeficit;
|
|
||||||
private boolean mThresholdExceeded;
|
|
||||||
//Start of the period summarized by the next warning: the detection (re)start or the previous warning.
|
|
||||||
private long mReportStart;
|
|
||||||
private double mUnreportedDroppedSamples;
|
|
||||||
private long mTotalDroppedSamples;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Constructs an instance
|
|
||||||
* @param tunerNameSupplier provides the tuner name for log messages.
|
|
||||||
* @param sampleRateSupplier provides the tuner's current sample rate.
|
|
||||||
*/
|
|
||||||
public SampleDropMonitor(Supplier<String> tunerNameSupplier, DoubleSupplier sampleRateSupplier)
|
|
||||||
{
|
|
||||||
mTunerNameSupplier = tunerNameSupplier;
|
|
||||||
mSampleRateSupplier = sampleRateSupplier;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Total number of samples detected as dropped since this monitor was created.
|
|
||||||
*/
|
|
||||||
public long getTotalDroppedSamples()
|
|
||||||
{
|
|
||||||
return mTotalDroppedSamples;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Processes a buffer of samples received from the tuner.
|
|
||||||
* @param sampleCount number of (complex) samples in the buffer.
|
|
||||||
*/
|
|
||||||
public void process(int sampleCount)
|
|
||||||
{
|
|
||||||
process(sampleCount, System.nanoTime());
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Processes a buffer of samples received from the tuner.
|
|
||||||
* @param sampleCount number of (complex) samples in the buffer.
|
|
||||||
* @param now arrival time in nanoseconds (System.nanoTime()).
|
|
||||||
*/
|
|
||||||
void process(int sampleCount, long now)
|
|
||||||
{
|
|
||||||
if(!mStarted || now - mLastBuffer > RESTART_GAP_NANOS)
|
|
||||||
{
|
|
||||||
restart(now);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
mLastBuffer = now;
|
|
||||||
//The samples of each buffer arriving within the window (after the window's starting buffer) were produced during
|
|
||||||
//the window.
|
|
||||||
mWindowSampleCount += sampleCount;
|
|
||||||
|
|
||||||
long elapsed = now - mWindowStart;
|
|
||||||
|
|
||||||
if(elapsed >= WINDOW_NANOS)
|
|
||||||
{
|
|
||||||
evaluate(now, elapsed);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Restarts detection. The buffer at the restart time starts the window and isn't counted, since its samples were
|
|
||||||
* produced before the window start.
|
|
||||||
*/
|
|
||||||
private void restart(long now)
|
|
||||||
{
|
|
||||||
mStarted = true;
|
|
||||||
mWindowStart = now;
|
|
||||||
mLastBuffer = now;
|
|
||||||
mLastLog = now - LOG_INTERVAL_NANOS;
|
|
||||||
mReportStart = now;
|
|
||||||
mUnreportedDroppedSamples = 0.0;
|
|
||||||
mWindowSampleCount = 0;
|
|
||||||
mSampleRate = mSampleRateSupplier.getAsDouble();
|
|
||||||
mAccumulatedDeficit = 0.0;
|
|
||||||
mThresholdExceeded = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Evaluates the completed window and starts the next window.
|
|
||||||
*/
|
|
||||||
private void evaluate(long now, long elapsed)
|
|
||||||
{
|
|
||||||
double sampleRate = mSampleRateSupplier.getAsDouble();
|
|
||||||
|
|
||||||
if(sampleRate != mSampleRate || sampleRate <= 0)
|
|
||||||
{
|
|
||||||
restart(now);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
double expected = sampleRate * elapsed / NANOS_PER_SECOND;
|
|
||||||
double deficit = expected - mWindowSampleCount;
|
|
||||||
mAccumulatedDeficit = Math.max(0.0, mAccumulatedDeficit + deficit - (expected * CLOCK_ALLOWANCE));
|
|
||||||
|
|
||||||
if(mAccumulatedDeficit > sampleRate * THRESHOLD_MILLISECONDS / 1000.0)
|
|
||||||
{
|
|
||||||
//Require the deficit to persist across a second window to rule out buffer delivery jitter.
|
|
||||||
if(mThresholdExceeded)
|
|
||||||
{
|
|
||||||
mUnreportedDroppedSamples += mAccumulatedDeficit;
|
|
||||||
mTotalDroppedSamples += (long)mAccumulatedDeficit;
|
|
||||||
mAccumulatedDeficit = 0.0;
|
|
||||||
mThresholdExceeded = false;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
mThresholdExceeded = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
mThresholdExceeded = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(mUnreportedDroppedSamples > 0 && now - mLastLog >= LOG_INTERVAL_NANOS)
|
|
||||||
{
|
|
||||||
double period = (double)(now - mReportStart) / NANOS_PER_SECOND;
|
|
||||||
double milliseconds = mUnreportedDroppedSamples / sampleRate * 1000.0;
|
|
||||||
double percent = mUnreportedDroppedSamples / (sampleRate * period) * 100.0;
|
|
||||||
LOG.warn("Tuner [" + mTunerNameSupplier.get() + "] is dropping samples - approximately [" +
|
|
||||||
(long)mUnreportedDroppedSamples + "] samples (" + Math.round(milliseconds) + " ms, " +
|
|
||||||
PERCENT_FORMAT.format(percent) + "% of the sample stream) were lost over the last " +
|
|
||||||
Math.round(period) + " seconds. The USB bus or the computer isn't keeping up with the tuner's " +
|
|
||||||
"sample rate. Dropped samples cause decoders to lose sync and cause choppy audio. Try a " +
|
|
||||||
"different USB port or USB controller, avoid USB hubs and extension cables, don't share the USB " +
|
|
||||||
"controller with other tuners, or lower the tuner sample rate.");
|
|
||||||
mLastLog = now;
|
|
||||||
mReportStart = now;
|
|
||||||
mUnreportedDroppedSamples = 0.0;
|
|
||||||
}
|
|
||||||
|
|
||||||
mWindowStart = now;
|
|
||||||
mWindowSampleCount = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user