altos: Use #define values for ublox packet types

[fw/altos] / altosui / AltosSiteMapTile.java

diff --git a/altosui/AltosSiteMapTile.java b/altosui/AltosSiteMapTile.java
index 66da7c54f01db2362941610adaf68a71ad91a91d..172e6397c6fe9875d193940932e6037c7f10e0f0 100644 (file)
--- a/altosui/AltosSiteMapTile.java
+++ b/altosui/AltosSiteMapTile.java
@@ -19,17 +19,10 @@ package altosui;
 
 import java.awt.*;
 import java.awt.image.*;
-import java.awt.event.*;
 import javax.swing.*;
-import javax.imageio.ImageIO;
-import javax.swing.table.*;
-import java.io.*;
-import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
-import java.lang.Math;
 import java.awt.geom.Point2D;
 import java.awt.geom.Line2D;
+import org.altusmetrum.altoslib_2.*;
 
 public class AltosSiteMapTile extends JLayeredPane {
        JLabel mapLabel;
@@ -43,6 +36,10 @@ public class AltosSiteMapTile extends JLayeredPane {
 
        public void clearMap() {
                fillLabel(mapLabel, Color.GRAY, px_size);
+               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));
        }
 
        static Color stateColors[] = {
@@ -59,7 +56,7 @@ public class AltosSiteMapTile extends JLayeredPane {
 
        private boolean drawn_landed_circle = false;
        private boolean drawn_boost_circle = false;
-       public synchronized void show(AltosState state, int crc_errors,
+       public synchronized void show(AltosState state, AltosListenerState listener_state,
                                      Point2D.Double last_pt, Point2D.Double pt)
        {
                if (0 <= state.state && state.state < stateColors.length) {
@@ -85,6 +82,13 @@ public class AltosSiteMapTile extends JLayeredPane {
                repaint();
        }
 
+       public void draw_circle(Point2D.Double pt) {
+               g2d.setColor(Color.RED);
+               g2d.drawOval((int)pt.x-5, (int)pt.y-5, 10, 10);
+               g2d.drawOval((int)pt.x-20, (int)pt.y-20, 40, 40);
+               g2d.drawOval((int)pt.x-35, (int)pt.y-35, 70, 70);
+       }
+
        public static Graphics2D fillLabel(JLabel l, Color c, int px_size) {
                BufferedImage img = new BufferedImage(px_size, px_size,
                                                      BufferedImage.TYPE_INT_ARGB);