diff options
| -rw-r--r-- | ao-tools/altosui/AltosFlightUI.java | 18 | ||||
| -rw-r--r-- | ao-tools/altosui/AltosSiteMap.java | 3 | ||||
| -rw-r--r-- | ao-tools/altosui/AltosSiteMapCache.java | 2 | ||||
| -rw-r--r-- | ao-tools/altosui/AltosSiteMapTile.java | 4 |
4 files changed, 15 insertions, 12 deletions
diff --git a/ao-tools/altosui/AltosFlightUI.java b/ao-tools/altosui/AltosFlightUI.java index 1107d527..732f7395 100644 --- a/ao-tools/altosui/AltosFlightUI.java +++ b/ao-tools/altosui/AltosFlightUI.java @@ -198,15 +198,15 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay { setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE); addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent e) { - disconnect(); - setVisible(false); - dispose(); - if (exit_on_close) - System.exit(0); - } - }); + @Override + public void windowClosing(WindowEvent e) { + disconnect(); + setVisible(false); + dispose(); + if (exit_on_close) + System.exit(0); + } + }); pack(); setVisible(true); diff --git a/ao-tools/altosui/AltosSiteMap.java b/ao-tools/altosui/AltosSiteMap.java index e222e2c8..2c542061 100644 --- a/ao-tools/altosui/AltosSiteMap.java +++ b/ao-tools/altosui/AltosSiteMap.java @@ -213,6 +213,8 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay { boolean initialised = false; public void show(AltosState state, int crc_errors) { // if insufficient gps data, nothing to update + if (state.gps == null) + return; if (!state.gps.locked) { if (state.pad_lat == 0 && state.pad_lon == 0) return; @@ -268,4 +270,3 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay { setPreferredSize(new Dimension(500,200)); } } - diff --git a/ao-tools/altosui/AltosSiteMapCache.java b/ao-tools/altosui/AltosSiteMapCache.java index e9dbf8e6..2e62cc45 100644 --- a/ao-tools/altosui/AltosSiteMapCache.java +++ b/ao-tools/altosui/AltosSiteMapCache.java @@ -33,6 +33,7 @@ import java.net.URLConnection; public class AltosSiteMapCache extends JLabel { public static boolean fetchMap(File file, String url) { URL u; + try { u = new URL(url); } catch (java.net.MalformedURLException e) { @@ -100,4 +101,3 @@ public class AltosSiteMapCache extends JLabel { } } } - diff --git a/ao-tools/altosui/AltosSiteMapTile.java b/ao-tools/altosui/AltosSiteMapTile.java index 8aee86c1..fd4cf0bb 100644 --- a/ao-tools/altosui/AltosSiteMapTile.java +++ b/ao-tools/altosui/AltosSiteMapTile.java @@ -125,10 +125,12 @@ public class AltosSiteMapTile extends JLayeredPane { draw = new JLabel(); g2d = fillLabel(draw, new Color(127, 127, 127, 0), px_size); + g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, + RenderingHints.VALUE_ANTIALIAS_ON); + g2d.setStroke(new BasicStroke(6, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND)); draw.setBounds(0, 0, px_size, px_size); draw.setOpaque(false); add(draw, new Integer(1)); } } - |