X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosFlightUI.java;h=b44b9d43b84c4a7f3f511120a4c2e183c68f028d;hp=286b2a4eeb3519e19a8fdfecfdb167b8e3cc5b80;hb=0820f5c6dfe067590f36e8201a4049719dcf3d7c;hpb=7f5b5848ad6ef5c808638a29c3dc0101b56ed11e

diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java
index 286b2a4e..b44b9d43 100644
--- a/altosui/AltosFlightUI.java
+++ b/altosui/AltosFlightUI.java
@@ -26,9 +26,9 @@ import java.io.*;
 import java.util.*;
 import java.text.*;
 import java.util.prefs.*;
-import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.*;
 
-public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
+public class AltosFlightUI extends JFrame implements AltosFlightDisplay, AltosFontListener {
 	AltosVoice		voice;
 	AltosFlightReader	reader;
 	AltosDisplayThread	thread;
@@ -39,8 +39,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,6 +83,21 @@ 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();
+	}
+
 	public void show(AltosState state, int crc_errors) {
 		JComponent tab = which_tab(state);
 		try {
@@ -96,7 +113,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;
@@ -118,11 +148,11 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 	}
 
 	Container	bag;
-	JComboBox	channels;
+	AltosFreqList	frequencies;
 	JComboBox	telemetries;
 
 	public AltosFlightUI(AltosVoice in_voice, AltosFlightReader in_reader, final int serial) {
-		AltosPreferences.init(this);
+		AltosPreferences.set_component(this);
 
 		voice = in_voice;
 		reader = in_reader;
@@ -141,33 +171,52 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 		/* Stick channel selector at top of table for telemetry monitoring */
 		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);
-				}
+			frequencies = new AltosFreqList(AltosPreferences.frequency(serial));
+			frequencies.set_product("Monitor");
+			frequencies.set_serial(serial);
+			frequencies.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						double frequency = frequencies.frequency();
+						try {
+							reader.set_frequency(frequency);
+						} catch (TimeoutException te) {
+						} catch (InterruptedException ie) {
+						}
+						reader.save_frequency();
+					}
 			});
 			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 (channels, c);
+			bag.add (frequencies, c);
 
 			// Telemetry format menu
 			telemetries = new JComboBox();
-			telemetries.addItem("TeleMetrum");
-			telemetries.addItem("TeleMini/TeleNano");
-			telemetries.setSelectedIndex(AltosPreferences.telemetry(serial) - 1);
-			telemetries.setMaximumRowCount(2);
+			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();
+						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);
@@ -198,12 +247,15 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 		descent = new AltosDescent();
 		pane.add("Descent", descent);
 
-		landed = new AltosLanded();
+		landed = new AltosLanded(reader);
 		pane.add("Landed", landed);
 
 		flightInfo = new AltosInfoTable();
 		pane.add("Table", new JScrollPane(flightInfo));
 
+		companion = new AltosCompanionInfo();
+		has_companion = false;
+
 		sitemap = new AltosSiteMap();
 		has_map = false;
 
@@ -217,12 +269,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);
 				}