projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Fix map preloading callbacks, run in separate thread
[fw/altos]
/
altosuilib
/
AltosUIMapPreloadNew.java
diff --git
a/altosuilib/AltosUIMapPreloadNew.java
b/altosuilib/AltosUIMapPreloadNew.java
index 2d4d45b2edd921bf80e49c46fe06a99c65b42759..3269bbddbdeaaa35535483b90dd61978584b0049 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_
8
;
+package org.altusmetrum.altosuilib_
10
;
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_
8
.*;
+import org.altusmetrum.altoslib_
10
.*;
class AltosUIMapPos extends Box {
AltosUIFrame owner;
class AltosUIMapPos extends Box {
AltosUIFrame owner;
@@
-127,8
+127,6
@@
public class AltosUIMapPreloadNew extends AltosUIFrame implements ActionListener
JProgressBar pbar;
JProgressBar pbar;
- AltosMapLoader loader;
-
JLabel site_list_label;
JComboBox<AltosLaunchSite> site_list;
JLabel site_list_label;
JComboBox<AltosLaunchSite> site_list;
@@
-189,7
+187,8
@@
public class AltosUIMapPreloadNew extends AltosUIFrame implements ActionListener
}
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);
}
}
@@
-237,7
+236,10
@@
public class AltosUIMapPreloadNew extends AltosUIFrame implements ActionListener
r = r * 1000;
loading = true;
r = r * 1000;
loading = true;
- loader.load(latitude, longitude, min_z, max_z, r, all_types());
+ new AltosMapLoader(map.map, this,
+ latitude, longitude,
+ min_z, max_z, r, all_types());
+
} catch (ParseException pe) {
load_button.setSelected(false);
}
} catch (ParseException pe) {
load_button.setSelected(false);
}
@@
-270,8
+272,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;