X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosFlightUI.java;h=c85fc9776259a150d5eabd8f1ed4ea46de08bb7e;hb=58f8d069ce9488e2987b8e92caa69fe68cda7569;hp=11fc24425598b238a341e422ee54c12c60bce472;hpb=eb77e806ded99532dc7eaa39c1893f075b028af6;p=fw%2Faltos

diff --git a/ao-tools/altosui/AltosFlightUI.java b/ao-tools/altosui/AltosFlightUI.java
index 11fc2442..c85fc977 100644
--- a/ao-tools/altosui/AltosFlightUI.java
+++ b/ao-tools/altosui/AltosFlightUI.java
@@ -36,10 +36,37 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 	AltosFlightReader	reader;
 	AltosDisplayThread	thread;
 
-	private Box vbox;
-	private AltosStatusTable flightStatus;
+	JTabbedPane	pane;
+
+	AltosPad	pad;
+	AltosAscent	ascent;
+	AltosDescent	descent;
+	AltosLanded	landed;
+    AltosSiteMap    sitemap;
+
+	private AltosFlightStatus flightStatus;
+	private JScrollPane flightInfoPane;
 	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) {
+		if (state.state < Altos.ao_flight_boost)
+			return tab_pad;
+		if (state.state <= Altos.ao_flight_coast)
+			return tab_ascent;
+		if (state.state <= Altos.ao_flight_main)
+			return tab_descent;
+		return tab_landed;
+	}
+
 	public int width() {
 		return flightInfo.width();
 	}
@@ -63,55 +90,117 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 	}
 
 	public void reset() {
+		pad.reset();
+		ascent.reset();
+		descent.reset();
+		landed.reset();
 		flightInfo.clear();
+		sitemap.reset();
 	}
 
 	public void show(AltosState state, int crc_errors) {
-		flightStatus.set(state);
+		int	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);
+			}
+			cur_tab = tab;
+		}
+		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);
+
 		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();
+		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);
+						AltosPreferences.set_channel(serial, channel);
+					}
+				});
+			c.gridx = 0;
+			c.gridy = 0;
+			c.anchor = GridBagConstraints.WEST;
+			bag.add (channels, c);
+		}
 
-		vbox = new Box (BoxLayout.Y_AXIS);
-		vbox.add(flightStatus);
+		flightStatus = new AltosFlightStatus();
+		c.gridx = 0;
+		c.gridy = 1;
+		c.fill = GridBagConstraints.HORIZONTAL;
+		c.weightx = 1;
+		bag.add(flightStatus, c);
 
-		flightInfo = new AltosInfoTable();
-		vbox.add(flightInfo.box());
+		pane = new JTabbedPane();
 
-		this.add(vbox);
+		pad = new AltosPad();
+		pane.add("Launch Pad", pad);
 
-		if (serial >= 0) {
-			JMenuBar menubar = new JMenuBar();
+		ascent = new AltosAscent();
+		pane.add("Ascent", ascent);
 
-			// 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);
-			}
+		descent = new AltosDescent();
+		pane.add("Descent", descent);
 
-			this.setJMenuBar(menubar);
-		}
+		landed = new AltosLanded();
+		pane.add("Landed", landed);
+
+		flightInfo = new AltosInfoTable();
+		flightInfoPane = new JScrollPane(flightInfo.box());
+		pane.add("Table", flightInfoPane);
+
+        sitemap = new AltosSiteMap();
+        pane.add("Site Map", sitemap);
+
+		c.gridx = 0;
+		c.gridy = 2;
+		c.fill = GridBagConstraints.BOTH;
+		c.weightx = 1;
+		c.weighty = 1;
+		bag.add(pane, c);
 
-		this.setSize(new Dimension (width(), height()));
+		this.setSize(this.getPreferredSize());
 		this.validate();
 
 		setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
@@ -121,6 +210,8 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 				disconnect();
 				setVisible(false);
 				dispose();
+				if (exit_on_close)
+					System.exit(0);
 			}
 		});