projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into branch-1.6
[fw/altos]
/
telegps
/
TeleGPS.java
diff --git
a/telegps/TeleGPS.java
b/telegps/TeleGPS.java
index 3b880b966fdc70f02261121035cc11743dc2e2da..0250a38ee3ef1b4d6ba031e874292574c0f05eac 100644
(file)
--- a/
telegps/TeleGPS.java
+++ b/
telegps/TeleGPS.java
@@
-24,8
+24,8
@@
import java.io.*;
import java.util.concurrent.*;
import java.util.*;
import java.text.*;
import java.util.concurrent.*;
import java.util.*;
import java.text.*;
-import org.altusmetrum.altoslib_
7
.*;
-import org.altusmetrum.altosuilib_
7
.*;
+import org.altusmetrum.altoslib_
9
.*;
+import org.altusmetrum.altosuilib_
9
.*;
public class TeleGPS
extends AltosUIFrame
public class TeleGPS
extends AltosUIFrame
@@
-373,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) {
@@
-481,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();
@@
-492,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>();
@@
-518,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);
@@
-534,13
+518,7
@@
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);
+ bag.add(pane, constraints(0, 3, GridBagConstraints.BOTH));
map = new AltosUIMapNew();
pane.add(map.getName(), map);
map = new AltosUIMapNew();
pane.add(map.getName(), map);