X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosFlightUI.java;h=d99da43dea0622b4f50bbd53ddbabeeb647bea9d;hb=d77a4ea206d627635159f35c76c744687d4e633b;hp=f0626e7ccdfae49fbd35bf35ccad01619d951f9b;hpb=9e1487b1a5db0afd1d23c86d82c60b1c1a62aab0;p=fw%2Faltos

diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java
index f0626e7c..d99da43d 100644
--- a/altosui/AltosFlightUI.java
+++ b/altosui/AltosFlightUI.java
@@ -28,7 +28,22 @@ import java.text.*;
 import java.util.prefs.*;
 import java.util.concurrent.*;
 
-public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
+class AltosFlightStatusUpdate implements ActionListener {
+
+	public AltosState	saved_state;
+	AltosFlightStatus	flightStatus;
+
+	public void actionPerformed (ActionEvent e) {
+		if (saved_state != null)
+			flightStatus.show(saved_state, 0);
+	}
+
+	public AltosFlightStatusUpdate (AltosFlightStatus in_flightStatus) {
+		flightStatus = in_flightStatus;
+	}
+}
+
+public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, AltosFontListener {
 	AltosVoice		voice;
 	AltosFlightReader	reader;
 	AltosDisplayThread	thread;
@@ -39,8 +54,10 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 	AltosAscent	ascent;
 	AltosDescent	descent;
 	AltosLanded	landed;
+	AltosCompanionInfo	companion;
 	AltosSiteMap    sitemap;
 	boolean		has_map;
+	boolean		has_companion;
 
 	private AltosFlightStatus flightStatus;
 	private AltosInfoTable flightInfo;
@@ -81,7 +98,26 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 		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();
+	}
+
+
+	AltosFlightStatusUpdate	status_update;
+
 	public void show(AltosState state, int crc_errors) {
+		status_update.saved_state = state;
 		JComponent tab = which_tab(state);
 		try {
 		pad.show(state, crc_errors);
@@ -96,7 +132,20 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 		}
 		flightStatus.show(state, crc_errors);
 		flightInfo.show(state, crc_errors);
-		if (state.gps != null) {
+
+		if (state.data.companion != null) {
+			if (!has_companion) {
+				pane.add("Companion", companion);
+				has_companion= true;
+			}
+			companion.show(state, crc_errors);
+		} else {
+			if (has_companion) {
+				pane.remove(companion);
+				has_companion = false;
+			}
+		}
+		if (state.gps != null && state.gps.connected) {
 			if (!has_map) {
 				pane.add("Site Map", sitemap);
 				has_map = true;
@@ -120,6 +169,9 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 	Container	bag;
 	AltosFreqList	frequencies;
 	JComboBox	telemetries;
+	JLabel		telemetry;
+
+	ActionListener	show_timer;
 
 	public AltosFlightUI(AltosVoice in_voice, AltosFlightReader in_reader, final int serial) {
 		AltosPreferences.set_component(this);
@@ -157,33 +209,61 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 			});
 			c.gridx = 0;
 			c.gridy = 0;
+			c.weightx = 0;
+			c.weighty = 0;
 			c.insets = new Insets(3, 3, 3, 3);
+			c.fill = GridBagConstraints.NONE;
 			c.anchor = GridBagConstraints.WEST;
 			bag.add (frequencies, c);
 
 			// Telemetry format menu
-			telemetries = new JComboBox();
-			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 ||
-			    telemetry > Altos.ao_telemetry_max)
-				telemetry = Altos.ao_telemetry_standard;
-			telemetries.setSelectedIndex(telemetry - 1);
-			telemetries.setMaximumRowCount(Altos.ao_telemetry_max);
-			telemetries.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						int telemetry = telemetries.getSelectedIndex() + 1;
-						reader.set_telemetry(telemetry);
-						reader.save_telemetry();
-					}
-				});
-			c.gridx = 1;
-			c.gridy = 0;
-			c.fill = GridBagConstraints.NONE;
-			c.anchor = GridBagConstraints.WEST;
-			bag.add (telemetries, c);
-			c.insets = new Insets(0, 0, 0, 0);
+			if (reader.supports_telemetry(Altos.ao_telemetry_standard)) {
+				telemetries = new JComboBox();
+				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 ||
+				    telemetry > Altos.ao_telemetry_max)
+					telemetry = Altos.ao_telemetry_standard;
+				telemetries.setSelectedIndex(telemetry - 1);
+				telemetries.setMaximumRowCount(Altos.ao_telemetry_max);
+				telemetries.setPreferredSize(null);
+				telemetries.revalidate();
+				telemetries.addActionListener(new ActionListener() {
+						public void actionPerformed(ActionEvent e) {
+							int telemetry = telemetries.getSelectedIndex() + 1;
+							reader.set_telemetry(telemetry);
+							reader.save_telemetry();
+						}
+					});
+				c.gridx = 1;
+				c.gridy = 0;
+				c.weightx = 0;
+				c.weighty = 0;
+				c.fill = GridBagConstraints.NONE;
+				c.anchor = GridBagConstraints.WEST;
+				bag.add (telemetries, c);
+				c.insets = new Insets(0, 0, 0, 0);
+			} else {
+				String	version;
+
+				if (reader.supports_telemetry(Altos.ao_telemetry_0_9))
+					version = "Telemetry: 0.9";
+				else if (reader.supports_telemetry(Altos.ao_telemetry_0_8))
+					version = "Telemetry: 0.8";
+				else
+					version = "Telemetry: None";
+
+				telemetry = new JLabel(version);
+				c.gridx = 1;
+				c.gridy = 0;
+				c.weightx = 0;
+				c.weighty = 0;
+				c.fill = GridBagConstraints.NONE;
+				c.anchor = GridBagConstraints.WEST;
+				bag.add (telemetry, c);
+				c.insets = new Insets(0, 0, 0, 0);
+			}
 		}
 
 		/* Flight status is always visible */
@@ -216,6 +296,9 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 		flightInfo = new AltosInfoTable();
 		pane.add("Table", new JScrollPane(flightInfo));
 
+		companion = new AltosCompanionInfo();
+		has_companion = false;
+
 		sitemap = new AltosSiteMap();
 		has_map = false;
 
@@ -229,12 +312,16 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 		bag.add(pane, c);
 
 		setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
+
+		AltosPreferences.register_font_listener(this);
+
 		addWindowListener(new WindowAdapter() {
 				@Override
 				public void windowClosing(WindowEvent e) {
 					disconnect();
 					setVisible(false);
 					dispose();
+					AltosPreferences.unregister_font_listener(AltosFlightUI.this);
 					if (exit_on_close)
 						System.exit(0);
 				}
@@ -245,6 +332,10 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 
 		thread = new AltosDisplayThread(this, voice, this, reader);
 
+		status_update = new AltosFlightStatusUpdate(flightStatus);
+
+		new javax.swing.Timer(100, status_update).start();
+
 		thread.start();
 	}