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

diff --git a/ao-tools/altosui/AltosFlightUI.java b/ao-tools/altosui/AltosFlightUI.java
index 558b0395..658d6f6f 100644
--- a/ao-tools/altosui/AltosFlightUI.java
+++ b/ao-tools/altosui/AltosFlightUI.java
@@ -44,8 +44,11 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 	AltosAscent	ascent;
 	AltosDescent	descent;
 	AltosLanded	landed;
+    AltosSiteMap    sitemap;
 
-	private AltosStatusTable flightStatus;
+	private AltosFlightStatus flightStatus;
+	private JScrollPane flightInfoPane;
+	private JScrollPane sitemapPane;
 	private AltosInfoTable flightInfo;
 
 	static final int tab_pad = 1;
@@ -55,6 +58,8 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 
 	int cur_tab = 0;
 
+	boolean exit_on_close = false;
+
 	int which_tab(AltosState state) {
 		if (state.state < Altos.ao_flight_boost)
 			return tab_pad;
@@ -93,6 +98,7 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 		descent.reset();
 		landed.reset();
 		flightInfo.clear();
+		sitemap.reset();
 	}
 
 	public void show(AltosState state, int crc_errors) {
@@ -117,11 +123,18 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 			}
 			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;
 	}
 
 	public AltosFlightUI(AltosVoice in_voice, AltosFlightReader in_reader, final int serial) {
+		AltosPreferences.init(this);
+
 		voice = in_voice;
 		reader = in_reader;
 
@@ -131,7 +144,7 @@ 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);
@@ -151,7 +164,12 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 		pane.add("Landed", landed);
 
 		flightInfo = new AltosInfoTable();
-		pane.add("Table", 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);
 
@@ -177,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);
@@ -187,6 +205,8 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 				disconnect();
 				setVisible(false);
 				dispose();
+				if (exit_on_close)
+					System.exit(0);
 			}
 		});