projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update java library version numbers
[fw/altos]
/
telegps
/
TeleGPS.java
diff --git
a/telegps/TeleGPS.java
b/telegps/TeleGPS.java
index d4b7bacf47b0575829a6d9f5ca93125dbe405e43..122b1182c1801d122fce66ff9bd39b06805094d2 100644
(file)
--- a/
telegps/TeleGPS.java
+++ b/
telegps/TeleGPS.java
@@
-23,8
+23,9
@@
import javax.swing.*;
import java.io.*;
import java.util.concurrent.*;
import java.util.*;
import java.io.*;
import java.util.concurrent.*;
import java.util.*;
-import org.altusmetrum.altoslib_5.*;
-import org.altusmetrum.altosuilib_3.*;
+import java.text.*;
+import org.altusmetrum.altoslib_10.*;
+import org.altusmetrum.altosuilib_10.*;
public class TeleGPS
extends AltosUIFrame
public class TeleGPS
extends AltosUIFrame
@@
-32,12
+33,12
@@
public class TeleGPS
{
static String[] telegps_icon_names = {
{
static String[] telegps_icon_names = {
- "/telegps-16.png",
- "/telegps-32.png",
- "/telegps-48.png",
- "/telegps-64.png",
- "/telegps-128.png",
- "/telegps-256.png"
+ "/
altusmetrum-
telegps-16.png",
+ "/
altusmetrum-
telegps-32.png",
+ "/
altusmetrum-
telegps-48.png",
+ "/
altusmetrum-
telegps-64.png",
+ "/
altusmetrum-
telegps-128.png",
+ "/
altusmetrum-
telegps-256.png"
};
static { set_icon_names(telegps_icon_names); }
};
static { set_icon_names(telegps_icon_names); }
@@
-67,11
+68,10
@@
public class TeleGPS
TeleGPSStatus telegps_status;
TeleGPSStatusUpdate status_update;
TeleGPSStatus telegps_status;
TeleGPSStatusUpdate status_update;
- javax.swing.Timer status_timer;
JTabbedPane pane;
JTabbedPane pane;
- AltosUIMap
map;
+ AltosUIMap
New
map;
TeleGPSInfo gps_info;
TeleGPSState gps_state;
AltosInfoTable info_table;
TeleGPSInfo gps_info;
TeleGPSState gps_state;
AltosInfoTable info_table;
@@
-147,6
+147,7
@@
public class TeleGPS
public void show(AltosState state, AltosListenerState listener_state) {
try {
status_update.saved_state = state;
public void show(AltosState state, AltosListenerState listener_state) {
try {
status_update.saved_state = state;
+ status_update.saved_listener_state = listener_state;
if (state == null)
state = new AltosState();
if (state == null)
state = new AltosState();
@@
-172,17
+173,13
@@
public class TeleGPS
}
void load_maps() {
}
void load_maps() {
- new AltosUIMapPreload(this);
+ new AltosUIMapPreload
New
(this);
}
void disconnect() {
setTitle("TeleGPS");
stop_display();
}
void disconnect() {
setTitle("TeleGPS");
stop_display();
- if (status_timer != null) {
- status_timer.stop();
- status_timer = null;
- status_update = null;
- }
+ telegps_status.stop();
telegps_status.disable_receive();
disable_frequency_menu();
telegps_status.disable_receive();
disable_frequency_menu();
@@
-376,7
+373,6
@@
public class TeleGPS
public void actionPerformed(ActionEvent e) {
int rate = rates.rate();
try {
public void actionPerformed(ActionEvent e) {
int rate = rates.rate();
try {
- System.out.printf("set rate %d\n", rate);
reader.set_telemetry_rate(rate);
} catch (TimeoutException te) {
} catch (InterruptedException ie) {
reader.set_telemetry_rate(rate);
} catch (TimeoutException te) {
} catch (InterruptedException ie) {
@@
-404,8
+400,7
@@
public class TeleGPS
public void set_reader(AltosFlightReader reader, AltosDevice device) {
status_update = new TeleGPSStatusUpdate(telegps_status);
public void set_reader(AltosFlightReader reader, AltosDevice device) {
status_update = new TeleGPSStatusUpdate(telegps_status);
- status_timer = new javax.swing.Timer(100, status_update);
- status_timer.start();
+ telegps_status.start(status_update);
setTitle(String.format("TeleGPS %s", reader.name));
thread = new TeleGPSDisplayThread(this, voice(), this, reader);
setTitle(String.format("TeleGPS %s", reader.name));
thread = new TeleGPSDisplayThread(this, voice(), this, reader);
@@
-485,8
+480,6
@@
public class TeleGPS
bag = getContentPane();
bag.setLayout(new GridBagLayout());
bag = getContentPane();
bag.setLayout(new GridBagLayout());
- GridBagConstraints c = new GridBagConstraints();
-
setTitle("TeleGPS");
menu_bar = new JMenuBar();
setTitle("TeleGPS");
menu_bar = new JMenuBar();
@@
-496,25
+489,16
@@
public class TeleGPS
monitor_menu = make_menu("Monitor", monitor_menu_entries);
device_menu = make_menu("Device", device_menu_entries);
monitor_menu = make_menu("Monitor", monitor_menu_entries);
device_menu = make_menu("Device", device_menu_entries);
+ set_inset(3);
frequencies = new AltosUIFreqList();
frequencies.setEnabled(false);
frequencies = new AltosUIFreqList();
frequencies.setEnabled(false);
- c.gridx = 0;
- c.gridy = 0;
- c.fill = GridBagConstraints.NONE;
- c.anchor = GridBagConstraints.WEST;
- c.weightx = 0;
- c.gridwidth = 1;
- bag.add(frequencies, c);
+ bag.add(frequencies, constraints (0, 1));
rates = new AltosUIRateList();
rates.setEnabled(false);
rates = new AltosUIRateList();
rates.setEnabled(false);
- c.gridx = 1;
- c.gridy = 0;
- c.fill = GridBagConstraints.NONE;
- c.anchor = GridBagConstraints.WEST;
- c.weightx = 0;
- c.gridwidth = 1;
- bag.add(rates, c);
+ bag.add(rates, constraints(1, 1));
+ next_row();
+ set_inset(0);
displays = new LinkedList<AltosFlightDisplay>();
displays = new LinkedList<AltosFlightDisplay>();
@@
-522,13
+506,9
@@
public class TeleGPS
/* TeleGPS status is always visible */
telegps_status = new TeleGPSStatus();
/* TeleGPS status is always visible */
telegps_status = new TeleGPSStatus();
- c.gridx = 0;
- c.gridy = 1;
- c.fill = GridBagConstraints.HORIZONTAL;
- c.weightx = 1;
- c.gridwidth = 2;
- bag.add(telegps_status, c);
- c.gridwidth = 1;
+ bag.add(telegps_status, constraints(0, 3, GridBagConstraints.HORIZONTAL));
+ next_row();
+
displays.add(telegps_status);
displays.add(telegps_status);
@@
-538,15
+518,9
@@
public class TeleGPS
pane = new JTabbedPane();
/* Make the tabbed pane use the rest of the window space */
pane = new JTabbedPane();
/* Make the tabbed pane use the rest of the window space */
- c.gridx = 0;
- c.gridy = 2;
- c.fill = GridBagConstraints.BOTH;
- c.weightx = 1;
- c.weighty = 1;
- c.gridwidth = 2;
- bag.add(pane, c);
-
- map = new AltosUIMap();
+ bag.add(pane, constraints(0, 3, GridBagConstraints.BOTH));
+
+ map = new AltosUIMapNew();
pane.add(map.getName(), map);
displays.add(map);
pane.add(map.getName(), map);
displays.add(map);
@@
-655,7
+629,6
@@
public class TeleGPS
public static void help(int code) {
System.out.printf("Usage: altosui [OPTION]... [FILE]...\n");
System.out.printf(" Options:\n");
public static void help(int code) {
System.out.printf("Usage: altosui [OPTION]... [FILE]...\n");
System.out.printf(" Options:\n");
- System.out.printf(" --fetchmaps <lat> <lon>\tpre-fetch maps for site map view\n");
System.out.printf(" --replay <filename>\t\trelive the glory of past flights \n");
System.out.printf(" --graph <filename>\t\tgraph a flight\n");
System.out.printf(" --csv\tgenerate comma separated output for spreadsheets, etc\n");
System.out.printf(" --replay <filename>\t\trelive the glory of past flights \n");
System.out.printf(" --graph <filename>\t\tgraph a flight\n");
System.out.printf(" --csv\tgenerate comma separated output for spreadsheets, etc\n");
@@
-680,16
+653,7
@@
public class TeleGPS
for (int i = 0; i < args.length; i++) {
if (args[i].equals("--help"))
help(0);
for (int i = 0; i < args.length; i++) {
if (args[i].equals("--help"))
help(0);
- else if (args[i].equals("--fetchmaps")) {
- if (args.length < i + 3) {
- help(1);
- } else {
- double lat = Double.parseDouble(args[i+1]);
- double lon = Double.parseDouble(args[i+2]);
- AltosUIMap.prefetch_maps(lat, lon);
- i += 2;
- }
- } else if (args[i].equals("--replay"))
+ else if (args[i].equals("--replay"))
process = process_replay;
else if (args[i].equals("--kml"))
process = process_kml;
process = process_replay;
else if (args[i].equals("--kml"))
process = process_kml;