X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosFlightUI.java;h=baa18686ca9b47a94c9b03141d1e9b31fb06bc1a;hb=e0dfa934ba76d6f913af37999e05c20e614bd3e9;hp=c04a4357f6f898bb5a54882abf7a9366cbeee76c;hpb=907cc6c50755c0d19b93c15678d6f3022a6ee10b;p=fw%2Faltos

diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java
index c04a4357..baa18686 100644
--- a/altosui/AltosFlightUI.java
+++ b/altosui/AltosFlightUI.java
@@ -21,10 +21,10 @@ import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import java.util.concurrent.*;
-import org.altusmetrum.altoslib_1.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;
 
-public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, AltosFontListener {
+public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
 	AltosVoice		voice;
 	AltosFlightReader	reader;
 	AltosDisplayThread	thread;
@@ -32,6 +32,7 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
 	JTabbedPane	pane;
 
 	AltosPad	pad;
+	AltosIgnitor	ignitor;
 	AltosAscent	ascent;
 	AltosDescent	descent;
 	AltosLanded	landed;
@@ -40,6 +41,7 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
 	boolean		has_map;
 	boolean		has_companion;
 	boolean		has_state;
+	boolean		has_ignitor;
 
 	private AltosFlightStatus flightStatus;
 	private AltosInfoTable flightInfo;
@@ -73,6 +75,7 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
 
 	public void reset() {
 		pad.reset();
+		ignitor.reset();
 		ascent.reset();
 		descent.reset();
 		landed.reset();
@@ -80,29 +83,39 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
 		sitemap.reset();
 	}
 
-	public void set_font() {
-		pad.set_font();
-		ascent.set_font();
-		descent.set_font();
-		landed.set_font();
-		flightStatus.set_font();
-		flightInfo.set_font();
-		sitemap.set_font();
-		companion.set_font();
-	}
-
 	public void font_size_changed(int font_size) {
-		set_font();
+		pad.font_size_changed(font_size);
+		ignitor.font_size_changed(font_size);
+		ascent.font_size_changed(font_size);
+		descent.font_size_changed(font_size);
+		landed.font_size_changed(font_size);
+		flightStatus.font_size_changed(font_size);
+		flightInfo.font_size_changed(font_size);
+		sitemap.font_size_changed(font_size);
+		companion.font_size_changed(font_size);
 	}
 
+	public void units_changed(boolean imperial_units) {
+		pad.units_changed(imperial_units);
+		ignitor.units_changed(imperial_units);
+		ascent.units_changed(imperial_units);
+		descent.units_changed(imperial_units);
+		landed.units_changed(imperial_units);
+		flightStatus.units_changed(imperial_units);
+		flightInfo.units_changed(imperial_units);
+		sitemap.units_changed(imperial_units);
+		companion.units_changed(imperial_units);
+	}
 
 	AltosFlightStatusUpdate	status_update;
 
-	public void show(AltosState state, int crc_errors) {
+	public void show(AltosState state, AltosListenerState listener_state) {
 		status_update.saved_state = state;
-		JComponent tab = which_tab(state);
-		try {
-		pad.show(state, crc_errors);
+
+		if (state == null)
+			state = new AltosState();
+
+		pad.show(state, listener_state);
 
 		if (state.state != Altos.ao_flight_startup) {
 			if (!has_state) {
@@ -114,25 +127,39 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
 			}
 		}
 
-		ascent.show(state, crc_errors);
-		descent.show(state, crc_errors);
-		landed.show(state, crc_errors);
+		ascent.show(state, listener_state);
+		descent.show(state, listener_state);
+		landed.show(state, listener_state);
 
+		JComponent tab = which_tab(state);
 		if (tab != cur_tab) {
 			if (cur_tab == pane.getSelectedComponent()) {
 				pane.setSelectedComponent(tab);
 			}
 			cur_tab = tab;
 		}
-		flightStatus.show(state, crc_errors);
-		flightInfo.show(state, crc_errors);
+		flightStatus.show(state, listener_state);
+		flightInfo.show(state, listener_state);
 
-		if (state.data.companion != null) {
+		if (ignitor.should_show(state)) {
+			if (!has_ignitor) {
+				pane.add("Ignitor", ignitor);
+				has_ignitor = true;
+			}
+			ignitor.show(state, listener_state);
+		} else {
+			if (has_ignitor) {
+				pane.remove(ignitor);
+				has_ignitor = false;
+			}
+		}
+
+		if (state.companion != null) {
 			if (!has_companion) {
 				pane.add("Companion", companion);
 				has_companion= true;
 			}
-			companion.show(state, crc_errors);
+			companion.show(state, listener_state);
 		} else {
 			if (has_companion) {
 				pane.remove(companion);
@@ -144,17 +171,13 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
 				pane.add("Site Map", sitemap);
 				has_map = true;
 			}
-			sitemap.show(state, crc_errors);
+			sitemap.show(state, listener_state);
 		} else {
 			if (has_map) {
 				pane.remove(sitemap);
 				has_map = false;
 			}
 		}
-		} catch (Exception e) {
-			System.out.print("Show exception " + e + "\n");
-			e.printStackTrace();
-		}
 	}
 
 	public void set_exit_on_close() {
@@ -163,7 +186,7 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
 
 	Container	bag;
 	AltosFreqList	frequencies;
-	JComboBox	telemetries;
+	JComboBox<String>	telemetries;
 	JLabel		telemetry;
 
 	ActionListener	show_timer;
@@ -209,8 +232,8 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
 
 			// Telemetry format menu
 			if (reader.supports_telemetry(Altos.ao_telemetry_standard)) {
-				telemetries = new JComboBox();
-				for (int i = 1; i <= Altos.ao_telemetry_max; i++) 
+				telemetries = new JComboBox<String>();
+				for (int i = 1; i <= Altos.ao_telemetry_max; i++)
 					telemetries.addItem(Altos.telemetry_name(i));
 				int telemetry = AltosPreferences.telemetry(serial);
 				if (telemetry <= Altos.ao_telemetry_off ||
@@ -275,6 +298,7 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
 		pad = new AltosPad();
 		pane.add("Status", pad);
 
+		ignitor = new AltosIgnitor();
 		ascent = new AltosAscent();
 		descent = new AltosDescent();
 		landed = new AltosLanded(reader);
@@ -301,6 +325,7 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
 		setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
 
 		AltosUIPreferences.register_font_listener(this);
+		AltosPreferences.register_units_listener(this);
 
 		addWindowListener(new WindowAdapter() {
 				@Override
@@ -309,6 +334,7 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
 					setVisible(false);
 					dispose();
 					AltosUIPreferences.unregister_font_listener(AltosFlightUI.this);
+					AltosPreferences.unregister_units_listener(AltosFlightUI.this);
 					if (exit_on_close)
 						System.exit(0);
 				}