X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosFlightUI.java;h=66dcdad57863f8942a49d2fc3d87ea3834ab5d48;hp=24d25bd7c46a0a4683fc732ce4441711a48a3fed;hb=91a75279b6d306ba9d068a28c64917d5312122e8;hpb=3fbefb3eea981d34a09496cf8abf0119de2e35bf

diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java
index 24d25bd7..66dcdad5 100644
--- a/altosui/AltosFlightUI.java
+++ b/altosui/AltosFlightUI.java
@@ -29,9 +29,6 @@ import java.util.prefs.*;
 import java.util.concurrent.LinkedBlockingQueue;
 
 public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
-	String[] statusNames = { "Height (m)", "State", "RSSI (dBm)", "Speed (m/s)" };
-	Object[][] statusData = { { "0", "pad", "-50", "0" } };
-
 	AltosVoice		voice;
 	AltosFlightReader	reader;
 	AltosDisplayThread	thread;
@@ -43,27 +40,22 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 	AltosDescent	descent;
 	AltosLanded	landed;
 	AltosSiteMap    sitemap;
+	boolean		has_map;
 
 	private AltosFlightStatus flightStatus;
 	private AltosInfoTable flightInfo;
 
-	static final int tab_pad = 1;
-	static final int tab_ascent = 2;
-	static final int tab_descent = 3;
-	static final int tab_landed = 4;
-
-	int cur_tab = 0;
-
 	boolean exit_on_close = false;
 
-	int which_tab(AltosState state) {
+	JComponent cur_tab = null;
+	JComponent which_tab(AltosState state) {
 		if (state.state < Altos.ao_flight_boost)
-			return tab_pad;
+			return pad;
 		if (state.state <= Altos.ao_flight_coast)
-			return tab_ascent;
+			return ascent;
 		if (state.state <= Altos.ao_flight_main)
-			return tab_descent;
-		return tab_landed;
+			return descent;
+		return landed;
 	}
 
 	void stop_display() {
@@ -90,30 +82,35 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 	}
 
 	public void show(AltosState state, int crc_errors) {
-		int	tab = which_tab(state);
+		JComponent tab = which_tab(state);
+		try {
 		pad.show(state, crc_errors);
 		ascent.show(state, crc_errors);
 		descent.show(state, crc_errors);
 		landed.show(state, crc_errors);
 		if (tab != cur_tab) {
-			switch (tab) {
-			case tab_pad:
-				pane.setSelectedComponent(pad);
-				break;
-			case tab_ascent:
-				pane.setSelectedComponent(ascent);
-				break;
-			case tab_descent:
-				pane.setSelectedComponent(descent);
-				break;
-			case tab_landed:
-				pane.setSelectedComponent(landed);
+			if (cur_tab == pane.getSelectedComponent()) {
+				pane.setSelectedComponent(tab);
 			}
 			cur_tab = tab;
 		}
 		flightStatus.show(state, crc_errors);
 		flightInfo.show(state, crc_errors);
-		sitemap.show(state, crc_errors);
+		if (state.gps != null) {
+			if (!has_map) {
+				pane.add("Site Map", sitemap);
+				has_map = true;
+			}
+			sitemap.show(state, crc_errors);
+		} else {
+			if (has_map) {
+				pane.remove(sitemap);
+				has_map = false;
+			}
+		}
+		} catch (Exception e) {
+			System.out.print("Show exception" + e);
+		}
 	}
 
 	public void set_exit_on_close() {
@@ -122,6 +119,7 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 
 	Container	bag;
 	JComboBox	channels;
+	JComboBox	telemetries;
 
 	public AltosFlightUI(AltosVoice in_voice, AltosFlightReader in_reader, final int serial) {
 		AltosPreferences.init(this);
@@ -152,8 +150,28 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 			});
 			c.gridx = 0;
 			c.gridy = 0;
+			c.insets = new Insets(3, 3, 3, 3);
 			c.anchor = GridBagConstraints.WEST;
 			bag.add (channels, c);
+
+			// Telemetry format menu
+			telemetries = new JComboBox();
+			telemetries.addItem("TeleMetrum");
+			telemetries.addItem("TeleMini/TeleNano");
+			telemetries.setSelectedIndex(AltosPreferences.telemetry(serial) - 1);
+			telemetries.setMaximumRowCount(2);
+			telemetries.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						int telemetry = telemetries.getSelectedIndex() + 1;
+						reader.set_telemetry(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);
 		}
 
 		/* Flight status is always visible */
@@ -162,7 +180,9 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 		c.gridy = 1;
 		c.fill = GridBagConstraints.HORIZONTAL;
 		c.weightx = 1;
+		c.gridwidth = 2;
 		bag.add(flightStatus, c);
+		c.gridwidth = 1;
 
 		/* The rest of the window uses a tabbed pane to
 		 * show one of the alternate data views
@@ -185,7 +205,7 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 		pane.add("Table", new JScrollPane(flightInfo));
 
 		sitemap = new AltosSiteMap();
-		pane.add("Site Map", sitemap);
+		has_map = false;
 
 		/* Make the tabbed pane use the rest of the window space */
 		c.gridx = 0;
@@ -193,6 +213,7 @@ public class AltosFlightUI extends JFrame 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);