X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=ao-tools%2Faltosui%2FAltosFlightUI.java;h=a3a28782ce13a223e5cf2455c5d1bc3fdff23612;hb=8df185cd95cfecbed8272dd1275d077c5b45535b;hp=56ab7ebc4ac01546d210b8446cb7c010d5816f9b;hpb=594e80572821f1848db062d0cff18ca8bf0d90ce;p=fw%2Faltos

diff --git a/ao-tools/altosui/AltosFlightUI.java b/ao-tools/altosui/AltosFlightUI.java
index 56ab7ebc..a3a28782 100644
--- a/ao-tools/altosui/AltosFlightUI.java
+++ b/ao-tools/altosui/AltosFlightUI.java
@@ -42,9 +42,9 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 	AltosAscent	ascent;
 	AltosDescent	descent;
 	AltosLanded	landed;
+	AltosSiteMap    sitemap;
 
 	private AltosFlightStatus flightStatus;
-	private JScrollPane flightInfoPane;
 	private AltosInfoTable flightInfo;
 
 	static final int tab_pad = 1;
@@ -66,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();
@@ -94,6 +86,7 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 		descent.reset();
 		landed.reset();
 		flightInfo.clear();
+		sitemap.reset();
 	}
 
 	public void show(AltosState state, int crc_errors) {
@@ -120,6 +113,7 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 		}
 		flightStatus.show(state, crc_errors);
 		flightInfo.show(state, crc_errors);
+		sitemap.show(state, crc_errors);
 	}
 
 	public void set_exit_on_close() {
@@ -127,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);
@@ -145,12 +140,13 @@ 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());
+						int channel = channels.getSelectedIndex();
 						reader.set_channel(channel);
 						AltosPreferences.set_channel(serial, channel);
 					}
@@ -161,6 +157,7 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 			bag.add (channels, c);
 		}
 
+		/* Flight status is always visible */
 		flightStatus = new AltosFlightStatus();
 		c.gridx = 0;
 		c.gridy = 1;
@@ -168,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();
@@ -183,9 +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();
+		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;
@@ -193,22 +196,20 @@ 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
-			public void windowClosing(WindowEvent e) {
-				disconnect();
-				setVisible(false);
-				dispose();
-				if (exit_on_close)
-					System.exit(0);
-			}
-		});
-
-		this.setVisible(true);
+				@Override
+				public void windowClosing(WindowEvent e) {
+					disconnect();
+					setVisible(false);
+					dispose();
+					if (exit_on_close)
+						System.exit(0);
+				}
+			});
+
+		pack();
+		setVisible(true);
 
 		thread = new AltosDisplayThread(this, voice, this, reader);