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

diff --git a/ao-tools/altosui/AltosFlightUI.java b/ao-tools/altosui/AltosFlightUI.java
index 11fc2442..658d6f6f 100644
--- a/ao-tools/altosui/AltosFlightUI.java
+++ b/ao-tools/altosui/AltosFlightUI.java
@@ -37,9 +37,39 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 	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 JScrollPane sitemapPane;
 	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,15 +93,48 @@ 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;
 	}
 
 	public AltosFlightUI(AltosVoice in_voice, AltosFlightReader in_reader, final int serial) {
+		AltosPreferences.init(this);
+
 		voice = in_voice;
 		reader = in_reader;
 
@@ -81,13 +144,34 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 
 		setTitle(String.format("AltOS %s", reader.name));
 
-		flightStatus = new AltosStatusTable();
+		flightStatus = new AltosFlightStatus();
 
 		vbox = new Box (BoxLayout.Y_AXIS);
 		vbox.add(flightStatus);
 
+		pane = new JTabbedPane();
+
+		pad = new AltosPad();
+		pane.add("Launch Pad", pad);
+
+		ascent = new AltosAscent();
+		pane.add("Ascent", ascent);
+
+		descent = new AltosDescent();
+		pane.add("Descent", descent);
+
+		landed = new AltosLanded();
+		pane.add("Landed", landed);
+
 		flightInfo = new AltosInfoTable();
-		vbox.add(flightInfo.box());
+		flightInfoPane = new JScrollPane(flightInfo.box());
+		pane.add("Table", flightInfoPane);
+
+        sitemap = new AltosSiteMap();
+		sitemapPane = new JScrollPane(sitemap);
+        pane.add("Site Map", sitemapPane);
+
+		vbox.add(pane);
 
 		this.add(vbox);
 
@@ -111,7 +195,7 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 			this.setJMenuBar(menubar);
 		}
 
-		this.setSize(new Dimension (width(), height()));
+		this.setSize(this.getPreferredSize());
 		this.validate();
 
 		setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
@@ -121,6 +205,8 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 				disconnect();
 				setVisible(false);
 				dispose();
+				if (exit_on_close)
+					System.exit(0);
 			}
 		});