summaryrefslogtreecommitdiff
path: root/ao-tools
diff options
context:
space:
mode:
Diffstat (limited to 'ao-tools')
-rw-r--r--ao-tools/altosui/AltosFlightUI.java8
-rw-r--r--ao-tools/altosui/AltosInfoTable.java4
-rw-r--r--ao-tools/altosui/AltosSiteMap.java167
-rw-r--r--ao-tools/altosui/Makefile.am1
4 files changed, 177 insertions, 3 deletions
diff --git a/ao-tools/altosui/AltosFlightUI.java b/ao-tools/altosui/AltosFlightUI.java
index 3581c54c..f56b3d1b 100644
--- a/ao-tools/altosui/AltosFlightUI.java
+++ b/ao-tools/altosui/AltosFlightUI.java
@@ -44,6 +44,7 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
AltosAscent ascent;
AltosDescent descent;
AltosLanded landed;
+ AltosSiteMap sitemap;
private AltosStatusTable flightStatus;
private AltosInfoTable flightInfo;
@@ -93,6 +94,7 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
descent.reset();
landed.reset();
flightInfo.clear();
+ sitemap.reset();
}
public void show(AltosState state, int crc_errors) {
@@ -119,6 +121,7 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
}
flightStatus.set(state);
flightInfo.show(state, crc_errors);
+ sitemap.show(state, crc_errors);
}
public AltosFlightUI(AltosVoice in_voice, AltosFlightReader in_reader, final int serial) {
@@ -153,7 +156,10 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
pane.add("Landed", landed);
flightInfo = new AltosInfoTable();
- pane.add("Table", flightInfo.box());
+ pane.add("Table", new JScrollPane(flightInfo.box()));
+
+ sitemap = new AltosSiteMap();
+ pane.add("Site Map", sitemap);
vbox.add(pane);
diff --git a/ao-tools/altosui/AltosInfoTable.java b/ao-tools/altosui/AltosInfoTable.java
index 2f326e07..9964ab10 100644
--- a/ao-tools/altosui/AltosInfoTable.java
+++ b/ao-tools/altosui/AltosInfoTable.java
@@ -37,8 +37,8 @@ public class AltosInfoTable {
private AltosFlightInfoTableModel model[];
private Box ibox[];
- private Font infoLabelFont = new Font("SansSerif", Font.PLAIN, 12);
- private Font infoValueFont = new Font("Monospaced", Font.PLAIN, 12);
+ private Font infoLabelFont = new Font("SansSerif", Font.PLAIN, 14);
+ private Font infoValueFont = new Font("Monospaced", Font.PLAIN, 14);
static final int info_columns = 3;
static final int info_rows = 17;
diff --git a/ao-tools/altosui/AltosSiteMap.java b/ao-tools/altosui/AltosSiteMap.java
new file mode 100644
index 00000000..1fb70b35
--- /dev/null
+++ b/ao-tools/altosui/AltosSiteMap.java
@@ -0,0 +1,167 @@
+/*
+ * Copyright © 2010 Anthony Towns <aj@erisian.com.au>
+ *
+ * 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; version 2 of the License.
+ *
+ * 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, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+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;
+
+public class AltosSiteMap extends JComponent implements AltosFlightDisplay {
+ double lat, lng;
+ int zoom;
+ double scale_x, scale_y;
+ Point2D.Double coord_pt;
+ Point2D.Double last_pt;
+
+ Graphics2D g2d;
+
+ private boolean setLocation(double new_lat, double new_lng) {
+ int new_zoom = 15;
+ lat = new_lat;
+ lng = new_lng;
+ zoom = new_zoom;
+ scale_x = 256/360.0 * Math.pow(2, zoom);
+ scale_y = 256/(2.0*Math.PI) * Math.pow(2, zoom);
+ coord_pt = pt(lat, lng, new Point2D.Double(0,0));
+ coord_pt.x = 320-coord_pt.x;
+ coord_pt.y = 320-coord_pt.y;
+ last_pt = null;
+
+ try {
+ File pngfile = new File(AltosPreferences.logdir(),
+ FileCoord(lat, lng, zoom));
+ System.out.printf("Trying file %s\n", pngfile);
+ BufferedImage myPicture = ImageIO.read(pngfile);
+ picLabel.setIcon(new ImageIcon( myPicture ));
+ g2d = myPicture.createGraphics();
+ } catch (Exception e) {
+ // throw new RuntimeException(e);
+ return false;
+ }
+ return true;
+ }
+
+ private static double limit(double v, double lo, double hi) {
+ if (v < lo)
+ return lo;
+ if (hi < v)
+ return hi;
+ return v;
+ }
+
+ private static String FileCoord(double lat, double lng, int zoom) {
+ char chlat = lat < 0 ? 'S' : 'N';
+ char chlng = lng < 0 ? 'E' : 'W';
+ if (lat < 0) lat = -lat;
+ if (lng < 0) lng = -lng;
+ return String.format("map-%c%.3f,%c%.3f-%d.png",
+ chlat, lat, chlng, lng, zoom);
+ }
+
+
+ // based on google js
+ // http://maps.gstatic.com/intl/en_us/mapfiles/api-3/2/10/main.js
+ // search for fromLatLngToPoint and fromPointToLatLng
+ private Point2D.Double pt(double lat, double lng) {
+ return pt(lat, lng, coord_pt);
+ }
+
+ private Point2D.Double pt(double lat, double lng, Point2D.Double centre) {
+ Point2D.Double res = new Point2D.Double();
+ double e;
+
+ res.x = centre.x + lng*scale_x;
+ e = limit(Math.sin(Math.toRadians(lat)),-(1-1.0E-15),1-1.0E-15);
+ res.y = centre.y + 0.5*Math.log((1+e)/(1-e))*-scale_y;
+ return res;
+ }
+
+
+ public void reset() {
+ // ?
+ }
+
+ static Color stateColors[] = {
+ Color.WHITE, // startup
+ Color.WHITE, // idle
+ Color.WHITE, // pad
+ Color.RED, // boost
+ Color.PINK, // fast
+ Color.YELLOW, // coast
+ Color.CYAN, // drogue
+ Color.BLUE, // main
+ Color.BLACK // landed
+ };
+
+ boolean nomaps = false;
+ public void show(AltosState state, int crc_errors) {
+ if (nomaps)
+ return;
+ if (!state.gps_ready && state.pad_lat == 0 && state.pad_lon == 0)
+ return;
+ double plat = (int)(state.pad_lat*200)/200.0;
+ double plon = (int)(state.pad_lon*200)/200.0;
+
+ if (last_pt == null) {
+ if (!setLocation(plat, plon)) {
+ nomaps = true;
+ return;
+ }
+ }
+
+ Point2D.Double pt = pt(state.gps.lat, state.gps.lon);
+ if (last_pt != null && pt != last_pt) {
+ if (0 <= state.state && state.state < stateColors.length) {
+ g2d.setColor(stateColors[state.state]);
+ }
+ g2d.draw(new Line2D.Double(last_pt, pt));
+ }
+ last_pt = pt;
+ repaint();
+ }
+
+ JLabel picLabel = new JLabel();
+
+ public AltosSiteMap() {
+ GridBagLayout layout = new GridBagLayout();
+ setLayout(layout);
+
+ GridBagConstraints c = new GridBagConstraints();
+
+ c.gridx = 0; c.gridy = 0;
+ c.weightx = 1; c.weighty = 1;
+ c.anchor = GridBagConstraints.CENTER;
+ c.fill = GridBagConstraints.BOTH;
+ picLabel = new JLabel();
+ JScrollPane scrollPane = new JScrollPane(picLabel);
+ layout.setConstraints(scrollPane, c);
+ add(scrollPane);
+
+ }
+}
+
diff --git a/ao-tools/altosui/Makefile.am b/ao-tools/altosui/Makefile.am
index 267bae63..fc532863 100644
--- a/ao-tools/altosui/Makefile.am
+++ b/ao-tools/altosui/Makefile.am
@@ -59,6 +59,7 @@ altosui_JAVA = \
AltosRomconfigUI.java \
AltosSerial.java \
AltosSerialMonitor.java \
+ AltosSiteMap.java \
AltosState.java \
AltosStatusTable.java \
AltosTelemetry.java \