X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosFlightUI.java;h=424c57da91db18c36e972044a501610e932c27e4;hp=43deb631705f86abc30dd5f072570daeb6e3a7ba;hb=2b57158737f85c7009658b3e923c66794f01bbdf;hpb=c11b2f5caa3fbe2bc977e716ec1c3ccee9e75884

diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java
index 43deb631..424c57da 100644
--- a/altosui/AltosFlightUI.java
+++ b/altosui/AltosFlightUI.java
@@ -22,8 +22,8 @@ import java.awt.event.*;
 import javax.swing.*;
 import java.util.*;
 import java.util.concurrent.*;
-import org.altusmetrum.altoslib_4.*;
-import org.altusmetrum.altosuilib_2.*;
+import org.altusmetrum.altoslib_6.*;
+import org.altusmetrum.altosuilib_6.*;
 
 public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
 	AltosVoice		voice;
@@ -97,6 +97,7 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
 
 	public void show(AltosState state, AltosListenerState listener_state) {
 		status_update.saved_state = state;
+		status_update.saved_listener_state = listener_state;
 
 		if (state == null)
 			state = new AltosState();
@@ -169,10 +170,11 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
 		exit_on_close = true;
 	}
 
-	Container	bag;
-	AltosFreqList	frequencies;
-	JComboBox<String>	telemetries;
-	JLabel		telemetry;
+	Container		bag;
+	AltosUIFreqList		frequencies;
+	AltosUIRateList		rates;
+	AltosUITelemetryList	telemetries;
+	JLabel			telemetry;
 
 	ActionListener	show_timer;
 
@@ -193,8 +195,8 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
 
 		/* Stick channel selector at top of table for telemetry monitoring */
 		if (serial >= 0) {
-			// Channel menu
-			frequencies = new AltosFreqList(AltosUIPreferences.frequency(serial));
+			// Frequency menu
+			frequencies = new AltosUIFreqList(AltosUIPreferences.frequency(serial));
 			frequencies.set_product("Monitor");
 			frequencies.set_serial(serial);
 			frequencies.addActionListener(new ActionListener() {
@@ -217,27 +219,40 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
 			c.anchor = GridBagConstraints.WEST;
 			bag.add (frequencies, c);
 
-			// Telemetry format menu
+			// Telemetry rate list
+			rates = new AltosUIRateList(AltosUIPreferences.telemetry_rate(serial));
+			rates.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						int rate = rates.rate();
+						try {
+							reader.set_telemetry_rate(rate);
+						} catch (TimeoutException te) {
+						} catch (InterruptedException ie) {
+						}
+						reader.save_telemetry_rate();
+					}
+				});
+			rates.setEnabled(reader.supports_telemetry_rate(AltosLib.ao_telemetry_rate_2400));
+			c.gridx = 1;
+			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 (rates, c);
+
+			// Telemetry format list
 			if (reader.supports_telemetry(Altos.ao_telemetry_standard)) {
-				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 ||
-				    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 = new AltosUITelemetryList(serial);
 				telemetries.addActionListener(new ActionListener() {
 						public void actionPerformed(ActionEvent e) {
-							int telemetry = telemetries.getSelectedIndex() + 1;
+							int telemetry = telemetries.get_selected();
 							reader.set_telemetry(telemetry);
 							reader.save_telemetry();
 						}
 					});
-				c.gridx = 1;
+				c.gridx = 2;
 				c.gridy = 0;
 				c.weightx = 0;
 				c.weighty = 0;
@@ -256,7 +271,7 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
 					version = "Telemetry: None";
 
 				telemetry = new JLabel(version);
-				c.gridx = 1;
+				c.gridx = 2;
 				c.gridy = 0;
 				c.weightx = 0;
 				c.weighty = 0;
@@ -274,9 +289,8 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
 		c.gridy = 1;
 		c.fill = GridBagConstraints.HORIZONTAL;
 		c.weightx = 1;
-		c.gridwidth = 2;
+		c.gridwidth = 3;
 		bag.add(flightStatus, c);
-		c.gridwidth = 1;
 
 		/* The rest of the window uses a tabbed pane to
 		 * show one of the alternate data views
@@ -315,7 +329,6 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
 		c.fill = GridBagConstraints.BOTH;
 		c.weightx = 1;
 		c.weighty = 1;
-		c.gridwidth = 2;
 		bag.add(pane, c);
 
 		setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
@@ -323,9 +336,14 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
 		AltosUIPreferences.register_font_listener(this);
 		AltosPreferences.register_units_listener(this);
 
+		status_update = new AltosFlightStatusUpdate(flightStatus);
+
+		flightStatus.start(status_update);
+
 		addWindowListener(new WindowAdapter() {
 				@Override
 				public void windowClosing(WindowEvent e) {
+					flightStatus.stop();
 					disconnect();
 					setVisible(false);
 					dispose();
@@ -341,10 +359,6 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
 
 		thread = new AltosDisplayThread(this, voice, this, reader);
 
-		status_update = new AltosFlightStatusUpdate(flightStatus);
-
-		new javax.swing.Timer(100, status_update).start();
-
 		thread.start();
 	}