summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--altosui/AltosSiteMap.java59
-rw-r--r--altosui/AltosSiteMapPreload.java285
-rw-r--r--altosui/AltosUI.java11
-rw-r--r--altosui/Makefile.am1
4 files changed, 340 insertions, 16 deletions
diff --git a/altosui/AltosSiteMap.java b/altosui/AltosSiteMap.java
index 7575c10e..73068138 100644
--- a/altosui/AltosSiteMap.java
+++ b/altosui/AltosSiteMap.java
@@ -150,10 +150,13 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
//System.out.printf("Loading/fetching map %s\n", pngfile);
Thread thread = new Thread() {
public void run() {
- ImageIcon res;
- res = AltosSiteMapCache.fetchAndLoadMap(pngfile, pngurl);
+ final ImageIcon res = AltosSiteMapCache.fetchAndLoadMap(pngfile, pngurl);
if (res != null) {
- tile.loadMap(res);
+ SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+ tile.loadMap(res);
+ }
+ });
} else {
System.out.printf("# Failed to fetch file %s\n", pngfile);
System.out.printf(" wget -O '%s' ''\n", pngfile, pngurl);
@@ -163,6 +166,24 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
thread.start();
}
+ File pngfile;
+ String pngurl;
+
+ public int prefetchMap(int x, int y) {
+ LatLng map_latlng = latlng(
+ -centre.x + x*px_size + px_size/2,
+ -centre.y + y*px_size + px_size/2);
+ pngfile = MapFile(map_latlng.lat, map_latlng.lng);
+ pngurl = MapURL(map_latlng.lat, map_latlng.lng);
+ if (pngfile.exists()) {
+ return 1;
+ } else if (AltosSiteMapCache.fetchMap(pngfile, pngurl)) {
+ return 0;
+ } else {
+ return -1;
+ }
+ }
+
public static void prefetchMaps(double lat, double lng, int w, int h) {
AltosSiteMap asm = new AltosSiteMap(true);
asm.centre = asm.getBaseLocation(lat, lng);
@@ -172,18 +193,18 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
int dx = -w/2, dy = -h/2;
for (int y = dy; y < h+dy; y++) {
for (int x = dx; x < w+dx; x++) {
- LatLng map_latlng = asm.latlng(
- -asm.centre.x + x*px_size + px_size/2,
- -asm.centre.y + y*px_size + px_size/2);
- File pngfile = asm.MapFile(map_latlng.lat, map_latlng.lng);
- String pngurl = asm.MapURL(map_latlng.lat, map_latlng.lng);
- if (pngfile.exists()) {
- System.out.printf("Already have %s\n", pngfile);
- } else if (AltosSiteMapCache.fetchMap(pngfile, pngurl)) {
- System.out.printf("Fetched map %s\n", pngfile);
- } else {
- System.out.printf("# Failed to fetch file %s\n", pngfile);
- System.out.printf(" wget -O '%s' ''\n", pngfile, pngurl);
+ int r = asm.prefetchMap(x, y);
+ switch (r) {
+ case 1:
+ System.out.printf("Already have %s\n", asm.pngfile);
+ break;
+ case 0:
+ System.out.printf("Fetched map %s\n", asm.pngfile);
+ break;
+ case -1:
+ System.out.printf("# Failed to fetch file %s\n", asm.pngfile);
+ System.out.printf(" wget -O '%s' ''\n", asm.pngfile, asm.pngurl);
+ break;
}
}
}
@@ -224,6 +245,12 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
boolean initialised = false;
Point2D.Double last_pt = null;
int last_state = -1;
+
+ public void show(double lat, double lon) {
+ initMaps(lat, lon);
+ initialised = true;
+ scrollRocketToVisible(pt(lat, lon));
+ }
public void show(final AltosState state, final int crc_errors) {
// if insufficient gps data, nothing to update
if (!state.gps.locked && state.gps.nsat < 4)
@@ -382,6 +409,6 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
}
}
setViewportView(comp);
- setPreferredSize(new Dimension(500,200));
+ setPreferredSize(new Dimension(500,500));
}
}
diff --git a/altosui/AltosSiteMapPreload.java b/altosui/AltosSiteMapPreload.java
new file mode 100644
index 00000000..2d9468b9
--- /dev/null
+++ b/altosui/AltosSiteMapPreload.java
@@ -0,0 +1,285 @@
+/*
+ * Copyright © 2011 Keith Packard <keithp@keithp.com>
+ *
+ * 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.swing.event.MouseInputAdapter;
+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;
+
+class AltosMapPos extends Box {
+ JLabel label;
+ JComboBox hemi;
+ JTextField deg;
+ JLabel deg_label;
+ JTextField min;
+ JLabel min_label;
+
+ public void set_value(double new_value) {
+ double d, m;
+ int h;
+
+ h = 0;
+ if (new_value < 0) {
+ h = 1;
+ new_value = -new_value;
+ }
+ d = Math.floor(new_value);
+ deg.setText(String.format("%3.0f", d));
+ m = (new_value - d) * 60.0;
+ min.setText(String.format("%7.4f", m));
+ hemi.setSelectedIndex(h);
+ }
+
+ public double get_value() throws NumberFormatException {
+ int h = hemi.getSelectedIndex();
+ double d = Double.parseDouble(deg.getText());
+ double m = Double.parseDouble(min.getText());
+ double v = d + m/60.0;
+ if (h == 1)
+ v = -v;
+ return v;
+ }
+
+ public AltosMapPos(String label_value,
+ String[] hemi_names,
+ double default_value) {
+ super(BoxLayout.X_AXIS);
+ label = new JLabel(label_value);
+ hemi = new JComboBox(hemi_names);
+ hemi.setEditable(false);
+ deg = new JTextField("000");
+ deg_label = new JLabel("degrees");
+ min = new JTextField("00.0000");
+ min_label = new JLabel("minutes");
+ set_value(default_value);
+ add(label);
+ add(Box.createRigidArea(new Dimension(5, 0)));
+ add(hemi);
+ add(Box.createRigidArea(new Dimension(5, 0)));
+ add(deg);
+ add(Box.createRigidArea(new Dimension(5, 0)));
+ add(deg_label);
+ add(Box.createRigidArea(new Dimension(5, 0)));
+ add(min);
+ add(Box.createRigidArea(new Dimension(5, 0)));
+ add(min_label);
+ }
+}
+
+public class AltosSiteMapPreload extends JDialog implements ActionListener {
+ AltosUI owner;
+ AltosSiteMap map;
+
+ AltosMapPos lat;
+ AltosMapPos lon;
+
+ JProgressBar pbar;
+
+ final static int width = 9;
+ final static int height = 9;
+ final static int tiles = width * height;
+
+ JToggleButton load_button;
+ boolean loading;
+ JButton close_button;
+
+ static final String[] lat_hemi_names = { "N", "S" };
+ static final String[] lon_hemi_names = { "E", "W" };
+
+ class updatePbar implements Runnable {
+ int n;
+ String s;
+
+ public updatePbar(int in_n, String in_s) {
+ n = in_n;
+ s = in_s;
+ }
+
+ public void run() {
+ pbar.setValue(n);
+ pbar.setString(s);
+ if (n == width * height) {
+ load_button.setSelected(false);
+ loading = false;
+ }
+ }
+ }
+
+ class bgLoad extends Thread {
+
+ AltosSiteMap map;
+
+ public bgLoad(AltosSiteMap in_map) {
+ map = in_map;
+ }
+
+ public void run() {
+ for (int y = 0; y < height; y++) {
+ for (int x = 0; x < width; x++) {
+ map.prefetchMap(y - height/2, x - width/2);
+ SwingUtilities.invokeLater(new updatePbar(y * height + x + 1,
+ map.pngfile.toString()));
+ }
+ }
+ }
+ }
+
+ public void actionPerformed(ActionEvent e) {
+ String cmd = e.getActionCommand();
+
+ if (cmd.equals("close"))
+ setVisible(false);
+
+ if (cmd.equals("load")) {
+ if (!loading) {
+ loading = true;
+ final double latitude = lat.get_value();
+ final double longitude = lon.get_value();
+ map.show(latitude,longitude);
+ bgLoad thread = new bgLoad(map);
+ thread.start();
+ }
+ }
+ }
+
+ public AltosSiteMapPreload(AltosUI in_owner) {
+ owner = in_owner;
+
+ Container pane = getContentPane();
+ GridBagConstraints c = new GridBagConstraints();
+ Insets i = new Insets(4,4,4,4);
+
+ pane.setLayout(new GridBagLayout());
+
+ map = new AltosSiteMap();
+
+ c.fill = GridBagConstraints.BOTH;
+ c.anchor = GridBagConstraints.CENTER;
+ c.insets = i;
+ c.weightx = 1;
+ c.weighty = 1;
+
+ c.gridx = 0;
+ c.gridy = 0;
+ c.gridwidth = 2;
+ c.anchor = GridBagConstraints.CENTER;
+
+ pane.add(map, c);
+
+ pbar = new JProgressBar();
+ pbar.setMinimum(0);
+ pbar.setMaximum(width * height);
+ pbar.setValue(0);
+ pbar.setString("");
+ pbar.setStringPainted(true);
+
+ c.fill = GridBagConstraints.HORIZONTAL;
+ c.anchor = GridBagConstraints.CENTER;
+ c.insets = i;
+ c.weightx = 1;
+ c.weighty = 0;
+
+ c.gridx = 0;
+ c.gridy = 1;
+ c.gridwidth = 2;
+
+ pane.add(pbar, c);
+
+ lat = new AltosMapPos("Latitude:",
+ lat_hemi_names,
+ 37.167833333);
+ c.fill = GridBagConstraints.NONE;
+ c.anchor = GridBagConstraints.CENTER;
+ c.insets = i;
+ c.weightx = 1;
+ c.weighty = 0;
+
+ c.gridx = 0;
+ c.gridy = 2;
+ c.gridwidth = 1;
+ c.anchor = GridBagConstraints.CENTER;
+
+ pane.add(lat, c);
+
+ lon = new AltosMapPos("Longitude:",
+ lon_hemi_names,
+ -97.73975);
+
+ c.fill = GridBagConstraints.NONE;
+ c.anchor = GridBagConstraints.CENTER;
+ c.insets = i;
+ c.weightx = 1;
+ c.weighty = 0;
+
+ c.gridx = 1;
+ c.gridy = 2;
+ c.gridwidth = 1;
+ c.anchor = GridBagConstraints.CENTER;
+
+ pane.add(lon, c);
+
+ load_button = new JToggleButton("Load Map");
+ load_button.addActionListener(this);
+ load_button.setActionCommand("load");
+
+ c.fill = GridBagConstraints.NONE;
+ c.anchor = GridBagConstraints.CENTER;
+ c.insets = i;
+ c.weightx = 1;
+ c.weighty = 0;
+
+ c.gridx = 0;
+ c.gridy = 3;
+ c.gridwidth = 1;
+ c.anchor = GridBagConstraints.CENTER;
+
+ pane.add(load_button, c);
+
+ close_button = new JButton("Close");
+ close_button.addActionListener(this);
+ close_button.setActionCommand("close");
+
+ c.fill = GridBagConstraints.NONE;
+ c.anchor = GridBagConstraints.CENTER;
+ c.insets = i;
+ c.weightx = 1;
+ c.weighty = 0;
+
+ c.gridx = 1;
+ c.gridy = 3;
+ c.gridwidth = 1;
+ c.anchor = GridBagConstraints.CENTER;
+
+ pane.add(close_button, c);
+
+ pack();
+ setLocationRelativeTo(owner);
+ setVisible(true);
+ }
+} \ No newline at end of file
diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index 6a24d8a9..d8c8d61c 100644
--- a/altosui/AltosUI.java
+++ b/altosui/AltosUI.java
@@ -180,6 +180,13 @@ public class AltosUI extends JFrame {
}
});
+ b = addButton(1, 2, "Load Maps");
+ b.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ LoadMaps();
+ }
+ });
+
setTitle("AltOS");
pane.doLayout();
@@ -238,6 +245,10 @@ public class AltosUI extends JFrame {
new AltosScanUI(AltosUI.this);
}
+ void LoadMaps() {
+ new AltosSiteMapPreload(AltosUI.this);
+ }
+
/*
* Replay a flight from telemetry data
*/
diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index 0a3ed0b1..18862d98 100644
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -88,6 +88,7 @@ altosui_JAVA = \
AltosSerialInUseException.java \
AltosSerialMonitor.java \
AltosSiteMap.java \
+ AltosSiteMapPreload.java \
AltosSiteMapCache.java \
AltosSiteMapTile.java \
AltosState.java \
generated by cgit v1.2.3 (git 2.39.1) at 2025-11-04 11:44:37 +0000