X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosFlightUI.java;h=7fcfb8be6da68d5f356dd723ea146cf195089127;hp=f56b3d1bd4cf200a79e6e8736fc1234ceaf486c9;hb=357826aa9c7b42c59f5d52b8eb016d73b6da0c7f;hpb=9c32b93ef5fb43558fb0179ea1b047e35b7ed6e8

diff --git a/ao-tools/altosui/AltosFlightUI.java b/ao-tools/altosui/AltosFlightUI.java
index f56b3d1b..7fcfb8be 100644
--- a/ao-tools/altosui/AltosFlightUI.java
+++ b/ao-tools/altosui/AltosFlightUI.java
@@ -36,42 +36,28 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 	AltosFlightReader	reader;
 	AltosDisplayThread	thread;
 
-	private Box vbox;
-
 	JTabbedPane	pane;
 
 	AltosPad	pad;
 	AltosAscent	ascent;
 	AltosDescent	descent;
 	AltosLanded	landed;
-    AltosSiteMap    sitemap;
+	AltosSiteMap    sitemap;
 
-	private AltosStatusTable flightStatus;
+	private AltosFlightStatus flightStatus;
 	private AltosInfoTable flightInfo;
 
-	static final int tab_pad = 1;
-	static final int tab_ascent = 2;
-	static final int tab_descent = 3;
-	static final int tab_landed = 4;
-
-	int cur_tab = 0;
+	boolean exit_on_close = false;
 
-	int which_tab(AltosState state) {
+	JComponent cur_tab = null;
+	JComponent which_tab(AltosState state) {
 		if (state.state < Altos.ao_flight_boost)
-			return tab_pad;
+			return pad;
 		if (state.state <= Altos.ao_flight_coast)
-			return tab_ascent;
+			return ascent;
 		if (state.state <= Altos.ao_flight_main)
-			return tab_descent;
-		return tab_landed;
-	}
-
-	public int width() {
-		return flightInfo.width();
-	}
-
-	public int height() {
-		return flightStatus.height() + flightInfo.height();
+			return descent;
+		return landed;
 	}
 
 	void stop_display() {
@@ -98,49 +84,73 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 	}
 
 	public void show(AltosState state, int crc_errors) {
-		int	tab = which_tab(state);
+		JComponent tab = which_tab(state);
 		pad.show(state, crc_errors);
 		ascent.show(state, crc_errors);
 		descent.show(state, crc_errors);
 		landed.show(state, crc_errors);
 		if (tab != cur_tab) {
-			switch (tab) {
-			case tab_pad:
-				pane.setSelectedComponent(pad);
-				break;
-			case tab_ascent:
-				pane.setSelectedComponent(ascent);
-				break;
-			case tab_descent:
-				pane.setSelectedComponent(descent);
-				break;
-			case tab_landed:
-				pane.setSelectedComponent(landed);
+			if (cur_tab == pane.getSelectedComponent()) {
+				pane.setSelectedComponent(tab);
 			}
 			cur_tab = tab;
 		}
-		flightStatus.set(state);
+		flightStatus.show(state, crc_errors);
 		flightInfo.show(state, crc_errors);
 		sitemap.show(state, crc_errors);
 	}
 
+	public void set_exit_on_close() {
+		exit_on_close = true;
+	}
+
+	Container	bag;
+	JComboBox	channels;
+
 	public AltosFlightUI(AltosVoice in_voice, AltosFlightReader in_reader, final int serial) {
-        AltosPreferences.init(this);
+		AltosPreferences.init(this);
 
 		voice = in_voice;
 		reader = in_reader;
 
+		bag = getContentPane();
+		bag.setLayout(new GridBagLayout());
+
+		GridBagConstraints c = new GridBagConstraints();
+
 		java.net.URL imgURL = AltosUI.class.getResource("/altus-metrum-16x16.jpg");
 		if (imgURL != null)
 			setIconImage(new ImageIcon(imgURL).getImage());
 
 		setTitle(String.format("AltOS %s", reader.name));
 
-		flightStatus = new AltosStatusTable();
-
-		vbox = new Box (BoxLayout.Y_AXIS);
-		vbox.add(flightStatus);
+		/* Stick channel selector at top of table for telemetry monitoring */
+		if (serial >= 0) {
+			// Channel menu
+			channels = new AltosChannelMenu(AltosPreferences.channel(serial));
+			channels.addActionListener(new ActionListener() {
+				public void actionPerformed(ActionEvent e) {
+					int channel = channels.getSelectedIndex();
+					reader.set_channel(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;
+		c.fill = GridBagConstraints.HORIZONTAL;
+		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();
@@ -156,49 +166,33 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 		pane.add("Landed", landed);
 
 		flightInfo = new AltosInfoTable();
-		pane.add("Table", new JScrollPane(flightInfo.box()));
+		pane.add("Table", new JScrollPane(flightInfo));
 
-        sitemap = new AltosSiteMap();
-        pane.add("Site Map", sitemap);
+		sitemap = new AltosSiteMap();
+		pane.add("Site Map", sitemap);
 
-		vbox.add(pane);
-
-		this.add(vbox);
-
-		if (serial >= 0) {
-			JMenuBar menubar = new JMenuBar();
-
-			// Channel menu
-			{
-				JMenu menu = new AltosChannelMenu(AltosPreferences.channel(serial));
-				menu.addActionListener(new ActionListener() {
-						public void actionPerformed(ActionEvent e) {
-							int channel = Integer.parseInt(e.getActionCommand());
-							reader.set_channel(channel);
-							AltosPreferences.set_channel(serial, channel);
-						}
-					});
-				menu.setMnemonic(KeyEvent.VK_C);
-				menubar.add(menu);
-			}
-
-			this.setJMenuBar(menubar);
-		}
-
-		this.setSize(new Dimension (width(), height()));
-		this.validate();
+		/* 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;
+		bag.add(pane, c);
 
 		setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
 		addWindowListener(new WindowAdapter() {
-			@Override
-			public void windowClosing(WindowEvent e) {
-				disconnect();
-				setVisible(false);
-				dispose();
-			}
-		});
-
-		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);