X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosFlightUI.java;h=1107d52725a62125d46c1c1940d73f908747d69a;hp=21b41528b32a056aee22989167cbead46b506425;hb=2a7dc3ba36bac81640a9498e0d0caf1470b57c19;hpb=0ecf033110084f1a8be98282d7029dc14f70dab5

diff --git a/ao-tools/altosui/AltosFlightUI.java b/ao-tools/altosui/AltosFlightUI.java
index 21b41528..1107d527 100644
--- a/ao-tools/altosui/AltosFlightUI.java
+++ b/ao-tools/altosui/AltosFlightUI.java
@@ -42,11 +42,9 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 	AltosAscent	ascent;
 	AltosDescent	descent;
 	AltosLanded	landed;
-    AltosSiteMap    sitemap;
+	AltosSiteMap    sitemap;
 
 	private AltosFlightStatus flightStatus;
-	private JScrollPane flightInfoPane;
-	private JScrollPane sitemapPane;
 	private AltosInfoTable flightInfo;
 
 	static final int tab_pad = 1;
@@ -68,14 +66,6 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 		return tab_landed;
 	}
 
-	public int width() {
-		return flightInfo.width();
-	}
-
-	public int height() {
-		return flightStatus.height() + flightInfo.height();
-	}
-
 	void stop_display() {
 		if (thread != null && thread.isAlive()) {
 			thread.interrupt();
@@ -131,6 +121,7 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 	}
 
 	Container	bag;
+	JComboBox	channels;
 
 	public AltosFlightUI(AltosVoice in_voice, AltosFlightReader in_reader, final int serial) {
 		AltosPreferences.init(this);
@@ -149,22 +140,24 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 
 		setTitle(String.format("AltOS %s", reader.name));
 
+		/* Stick channel selector at top of table for telemetry monitoring */
 		if (serial >= 0) {
 			// Channel menu
-			JComboBox channels = new AltosChannelMenu(AltosPreferences.channel(serial));
+			channels = new AltosChannelMenu(AltosPreferences.channel(serial));
 			channels.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						int channel = Integer.parseInt(e.getActionCommand());
-						reader.set_channel(channel);
-						AltosPreferences.set_channel(serial, channel);
-					}
-				});
+				public void actionPerformed(ActionEvent e) {
+					int channel = channels.getSelectedIndex();
+					reader.set_channel(channel);
+					AltosPreferences.set_channel(serial, channel);
+				}
+			});
 			c.gridx = 0;
 			c.gridy = 0;
 			c.anchor = GridBagConstraints.WEST;
 			bag.add (channels, c);
 		}
 
+		/* Flight status is always visible */
 		flightStatus = new AltosFlightStatus();
 		c.gridx = 0;
 		c.gridy = 1;
@@ -172,6 +165,9 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 		c.weightx = 1;
 		bag.add(flightStatus, c);
 
+		/* The rest of the window uses a tabbed pane to
+		 * show one of the alternate data views
+		 */
 		pane = new JTabbedPane();
 
 		pad = new AltosPad();
@@ -187,13 +183,12 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 		pane.add("Landed", landed);
 
 		flightInfo = new AltosInfoTable();
-		flightInfoPane = new JScrollPane(flightInfo.box());
-		pane.add("Table", flightInfoPane);
+		pane.add("Table", new JScrollPane(flightInfo));
 
-        sitemap = new AltosSiteMap();
-		sitemapPane = new JScrollPane(sitemap);
-        pane.add("Site Map", sitemapPane);
+		sitemap = new AltosSiteMap();
+		pane.add("Site Map", sitemap);
 
+		/* Make the tabbed pane use the rest of the window space */
 		c.gridx = 0;
 		c.gridy = 2;
 		c.fill = GridBagConstraints.BOTH;
@@ -201,9 +196,6 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 		c.weighty = 1;
 		bag.add(pane, c);
 
-		this.setSize(this.getPreferredSize());
-		this.validate();
-
 		setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
 		addWindowListener(new WindowAdapter() {
 			@Override
@@ -216,7 +208,8 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 			}
 		});
 
-		this.setVisible(true);
+		pack();
+		setVisible(true);
 
 		thread = new AltosDisplayThread(this, voice, this, reader);