GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-12 16:47:31 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

#778 Updates Icon Manager to JavaFX. Resolves issue with displaying custom icons in alias editor. (#796)

Browse Source 
Co-authored-by: Denny <denny@denny-desktop>
This commit is contained in:
Denny Sheirer
2020-05-06 08:08:05 +00:00
committed by GitHub
parent 2aff9ee817
commit 2723926f83
36 changed files with 1129 additions and 1051 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/io/github/dsheirer/map/MapPanel.java
View File

@@ -19,7 +19,7 @@
package io.github.dsheirer.map;
import io.github.dsheirer.alias.AliasModel;
import io.github.dsheirer.icon.IconManager;
import io.github.dsheirer.icon.IconModel;
import io.github.dsheirer.settings.MapViewSetting;
import io.github.dsheirer.settings.SettingsManager;
import net.miginfocom.swing.MigLayout;
@@ -43,11 +43,11 @@ public class MapPanel extends JPanel implements IPlottableUpdateListener
private JXMapViewer mMapViewer = new JXMapViewer();
private PlottableEntityPainter mMapPainter;
public MapPanel(MapService mapService, AliasModel aliasModel, IconManager iconManager, SettingsManager settingsManager)
public MapPanel(MapService mapService, AliasModel aliasModel, IconModel iconModel, SettingsManager settingsManager)
{
mSettingsManager = settingsManager;
mMapService = mapService;
mMapPainter = new PlottableEntityPainter(aliasModel, iconManager);
mMapPainter = new PlottableEntityPainter(aliasModel, iconModel);
init();
}

8
src/main/java/io/github/dsheirer/map/MapService.java
View File

@@ -19,7 +19,7 @@
*/
package io.github.dsheirer.map;
import io.github.dsheirer.icon.IconManager;
import io.github.dsheirer.icon.IconModel;
import io.github.dsheirer.identifier.Identifier;
import io.github.dsheirer.module.decode.event.IDecodeEvent;
import io.github.dsheirer.module.decode.event.PlottableDecodeEvent;
@@ -39,11 +39,11 @@ public class MapService implements Listener<IDecodeEvent>
private int mMaxHistory = 2;
private List<IPlottableUpdateListener> mListeners = new ArrayList<IPlottableUpdateListener>();
private Map<Identifier,PlottableEntityHistory> mEntityHistories = new HashMap<>();
private IconManager mIconManager;
private IconModel mIconModel;
public MapService(IconManager resourceManager)
public MapService(IconModel resourceManager)
{
mIconManager = resourceManager;
mIconModel = resourceManager;
}
@Override

6
src/main/java/io/github/dsheirer/map/PlottableEntityPainter.java
View File

@@ -21,7 +21,7 @@
package io.github.dsheirer.map;
import io.github.dsheirer.alias.AliasModel;
import io.github.dsheirer.icon.IconManager;
import io.github.dsheirer.icon.IconModel;
import org.jdesktop.swingx.JXMapViewer;
import org.jdesktop.swingx.painter.AbstractPainter;
@@ -36,9 +36,9 @@ public class PlottableEntityPainter extends AbstractPainter<JXMapViewer>
private PlottableEntityRenderer mRenderer;
private Set<PlottableEntityHistory> mEntities = new HashSet<>();
public PlottableEntityPainter(AliasModel aliasModel, IconManager iconManager)
public PlottableEntityPainter(AliasModel aliasModel, IconModel iconModel)
{
mRenderer = new PlottableEntityRenderer(aliasModel, iconManager);
mRenderer = new PlottableEntityRenderer(aliasModel, iconModel);
setAntialiasing(true);
setCacheable(false);
}

10
src/main/java/io/github/dsheirer/map/PlottableEntityRenderer.java
View File

@@ -22,7 +22,7 @@ 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.IconManager;
import io.github.dsheirer.icon.IconModel;
import org.jdesktop.swingx.JXMapViewer;
import org.jdesktop.swingx.mapviewer.GeoPosition;
@@ -38,12 +38,12 @@ import java.util.List;
public class PlottableEntityRenderer
{
private AliasModel mAliasModel;
private IconManager mIconManager;
private IconModel mIconModel;
public PlottableEntityRenderer(AliasModel aliasModel, IconManager iconManager)
public PlottableEntityRenderer(AliasModel aliasModel, IconModel iconModel)
{
mAliasModel = aliasModel;
mIconManager = iconManager;
mIconModel = iconModel;
}
public void paintPlottableEntity(Graphics2D g, JXMapViewer viewer, PlottableEntityHistory entity, boolean antiAliasing)
@@ -118,7 +118,7 @@ public class PlottableEntityRenderer
private ImageIcon getIcon(Alias alias)
{
String iconName = (alias != null ? alias.getIconName() : null);
return mIconManager.getIcon(iconName, IconManager.DEFAULT_ICON_SIZE);
return mIconModel.getIcon(iconName, IconModel.DEFAULT_ICON_SIZE);
}
private void paintIcon(Graphics2D graphics, Point2D point, ImageIcon icon)