projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump java library versions
[fw/altos]
/
altosuilib
/
AltosUIMapPreloadNew.java
diff --git
a/altosuilib/AltosUIMapPreloadNew.java
b/altosuilib/AltosUIMapPreloadNew.java
index c1c3f8bb59d3076719e3e03fb9f435921e1c8683..b16659da5b79f6fb1854dde89cef1d50cec503ab 100644
(file)
--- a/
altosuilib/AltosUIMapPreloadNew.java
+++ b/
altosuilib/AltosUIMapPreloadNew.java
@@
-15,7
+15,7
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altosuilib_
9
;
+package org.altusmetrum.altosuilib_
11
;
import java.awt.*;
import java.awt.event.*;
import java.awt.*;
import java.awt.event.*;
@@
-26,7
+26,7
@@
import java.text.*;
import java.lang.Math;
import java.net.URL;
import java.net.URLConnection;
import java.lang.Math;
import java.net.URL;
import java.net.URLConnection;
-import org.altusmetrum.altoslib_
9
.*;
+import org.altusmetrum.altoslib_
11
.*;
class AltosUIMapPos extends Box {
AltosUIFrame owner;
class AltosUIMapPos extends Box {
AltosUIFrame owner;
@@
-127,13
+127,10
@@
public class AltosUIMapPreloadNew extends AltosUIFrame implements ActionListener
JProgressBar pbar;
JProgressBar pbar;
- AltosMapLoader loader;
-
JLabel site_list_label;
JComboBox<AltosLaunchSite> site_list;
JToggleButton load_button;
JLabel site_list_label;
JComboBox<AltosLaunchSite> site_list;
JToggleButton load_button;
- boolean loading;
JButton close_button;
JCheckBox[] maptypes = new JCheckBox[AltosMap.maptype_terrain - AltosMap.maptype_hybrid + 1];
JButton close_button;
JCheckBox[] maptypes = new JCheckBox[AltosMap.maptype_terrain - AltosMap.maptype_hybrid + 1];
@@
-141,6
+138,7
@@
public class AltosUIMapPreloadNew extends AltosUIFrame implements ActionListener
JComboBox<Integer> min_zoom;
JComboBox<Integer> max_zoom;
JComboBox<Double> radius;
JComboBox<Integer> min_zoom;
JComboBox<Integer> max_zoom;
JComboBox<Double> radius;
+ int scale = 1;
Integer[] zooms = { -12, -11, -10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6 };
Integer[] zooms = { -12, -11, -10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6 };
@@
-149,14
+147,19
@@
public class AltosUIMapPreloadNew extends AltosUIFrame implements ActionListener
Double[] radius_km = { 2.0, 5.0, 10.0, 20.0, 30.0 };
Double radius_def_km = 10.0;
Double[] radius_km = { 2.0, 5.0, 10.0, 20.0, 30.0 };
Double radius_def_km = 10.0;
+ AltosMapLoader loader;
static final String[] lat_hemi_names = { "N", "S" };
static final String[] lon_hemi_names = { "E", "W" };
double latitude, longitude;
static final String[] lat_hemi_names = { "N", "S" };
static final String[] lon_hemi_names = { "E", "W" };
double latitude, longitude;
+ long loader_notify_time;
+
/* AltosMapLoaderListener interfaces */
public void loader_start(final int max) {
/* AltosMapLoaderListener interfaces */
public void loader_start(final int max) {
+ loader_notify_time = System.currentTimeMillis();
+
SwingUtilities.invokeLater(new Runnable() {
public void run() {
pbar.setMaximum(max);
SwingUtilities.invokeLater(new Runnable() {
public void run() {
pbar.setMaximum(max);
@@
-169,6
+172,13
@@
public class AltosUIMapPreloadNew extends AltosUIFrame implements ActionListener
}
public void loader_notify(final int cur, final int max, final String name) {
}
public void loader_notify(final int cur, final int max, final String name) {
+ long now = System.currentTimeMillis();
+
+ if (now - loader_notify_time < 100)
+ return;
+
+ loader_notify_time = now;
+
SwingUtilities.invokeLater(new Runnable() {
public void run() {
pbar.setValue(cur);
SwingUtilities.invokeLater(new Runnable() {
public void run() {
pbar.setValue(cur);
@@
-178,18
+188,19
@@
public class AltosUIMapPreloadNew extends AltosUIFrame implements ActionListener
}
public void loader_done(int max) {
}
public void loader_done(int max) {
+ loader = null;
SwingUtilities.invokeLater(new Runnable() {
public void run() {
pbar.setValue(0);
pbar.setString("");
load_button.setSelected(false);
SwingUtilities.invokeLater(new Runnable() {
public void run() {
pbar.setValue(0);
pbar.setString("");
load_button.setSelected(false);
- loading = false;
}
});
}
public void debug(String format, Object ... arguments) {
}
});
}
public void debug(String format, Object ... arguments) {
- System.out.printf(format, arguments);
+ if (AltosSerial.debug)
+ System.out.printf(format, arguments);
}
}
@@
-217,11
+228,14
@@
public class AltosUIMapPreloadNew extends AltosUIFrame implements ActionListener
public void actionPerformed(ActionEvent e) {
String cmd = e.getActionCommand();
public void actionPerformed(ActionEvent e) {
String cmd = e.getActionCommand();
- if (cmd.equals("close"))
+ if (cmd.equals("close")) {
+ if (loader != null)
+ loader.abort();
setVisible(false);
setVisible(false);
+ }
if (cmd.equals("load")) {
if (cmd.equals("load")) {
- if (
!loading
) {
+ if (
loader == null
) {
try {
latitude = lat.get_value();
longitude = lon.get_value();
try {
latitude = lat.get_value();
longitude = lon.get_value();
@@
-232,12
+246,17
@@
public class AltosUIMapPreloadNew extends AltosUIFrame implements ActionListener
Double r = (Double) radius.getSelectedItem();
if (AltosPreferences.imperial_units())
Double r = (Double) radius.getSelectedItem();
if (AltosPreferences.imperial_units())
- r = AltosConvert.
distance.inverse
(r);
+ r = AltosConvert.
miles_to_meters
(r);
else
r = r * 1000;
else
r = r * 1000;
- loading = true;
- loader.load(latitude, longitude, min_z, max_z, r, all_types());
+ map.map.centre(new AltosLatLon(latitude, longitude));
+
+ loader = new AltosMapLoader(this,
+ latitude, longitude,
+ min_z, max_z, r,
+ all_types(), scale);
+
} catch (ParseException pe) {
load_button.setSelected(false);
}
} catch (ParseException pe) {
load_button.setSelected(false);
}
@@
-270,8
+289,6
@@
public class AltosUIMapPreloadNew extends AltosUIFrame implements ActionListener
map = new AltosUIMapNew();
map = new AltosUIMapNew();
- loader = new AltosMapLoader(map.map, this);
-
c.fill = GridBagConstraints.BOTH;
c.anchor = GridBagConstraints.CENTER;
c.insets = i;
c.fill = GridBagConstraints.BOTH;
c.anchor = GridBagConstraints.CENTER;
c.insets = i;