X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosFlightUI.java;h=8742b8ca33210b8983c2d5504b2266a472d8e58d;hp=c31e02bf095ad695267444027da9481e90112ed3;hb=e9a3268285e97b7316c3321892e77814703ff71d;hpb=d4cc16e111229b02d1081e2693ace0b33f662498

diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java
index c31e02bf..8742b8ca 100644
--- a/altosui/AltosFlightUI.java
+++ b/altosui/AltosFlightUI.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,27 +21,31 @@ package altosui;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
-import java.io.*;
 import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
 import java.util.concurrent.*;
+import org.altusmetrum.altoslib_13.*;
+import org.altusmetrum.altosuilib_13.*;
 
-public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
+public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
 	AltosVoice		voice;
 	AltosFlightReader	reader;
 	AltosDisplayThread	thread;
 
+	LinkedList<AltosFlightDisplay> displays;
+
 	JTabbedPane	pane;
 
 	AltosPad	pad;
+	AltosIgnitor	igniter;
 	AltosAscent	ascent;
 	AltosDescent	descent;
 	AltosLanded	landed;
-	AltosSiteMap    sitemap;
+	AltosCompanionInfo	companion;
+	AltosUIMap      sitemap;
 	boolean		has_map;
+	boolean		has_companion;
+	boolean		has_state;
+	boolean		has_igniter;
 
 	private AltosFlightStatus flightStatus;
 	private AltosInfoTable flightInfo;
@@ -49,11 +54,13 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 
 	JComponent cur_tab = null;
 	JComponent which_tab(AltosState state) {
-		if (state.state < Altos.ao_flight_boost)
+		if (state.state() < Altos.ao_flight_boost)
 			return pad;
-		if (state.state <= Altos.ao_flight_coast)
+		if (state.state() <= Altos.ao_flight_coast)
 			return ascent;
-		if (state.state <= Altos.ao_flight_main)
+		if (state.state() <= Altos.ao_flight_main)
+			return descent;
+		if (state.state() == AltosLib.ao_flight_stateless)
 			return descent;
 		return landed;
 	}
@@ -73,43 +80,89 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 	}
 
 	public void reset() {
-		pad.reset();
-		ascent.reset();
-		descent.reset();
-		landed.reset();
-		flightInfo.clear();
-		sitemap.reset();
+		for (AltosFlightDisplay d : displays)
+			d.reset();
+	}
+
+	public void font_size_changed(int font_size) {
+		for (AltosFlightDisplay d : displays)
+			d.font_size_changed(font_size);
+	}
+
+	public void units_changed(boolean imperial_units) {
+		for (AltosFlightDisplay d : displays)
+			d.units_changed(imperial_units);
 	}
 
-	public void show(AltosState state, int crc_errors) {
+	AltosFlightStatusUpdate	status_update;
+
+	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(new AltosCalData());
+
+		if (state.state() != Altos.ao_flight_startup) {
+			if (!has_state) {
+				pane.setTitleAt(0, "Launch Pad");
+				pane.add(ascent, 1);
+				pane.add(descent, 2);
+				pane.add(landed, 3);
+				has_state = true;
+			}
+		}
+
 		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) {
-			if (cur_tab == pane.getSelectedComponent()) {
+			if (cur_tab == pane.getSelectedComponent())
 				pane.setSelectedComponent(tab);
-			}
 			cur_tab = tab;
 		}
-		flightStatus.show(state, crc_errors);
-		flightInfo.show(state, crc_errors);
+
+		if (igniter.should_show(state)) {
+			if (!has_igniter) {
+				pane.add("Ignitor", igniter);
+				has_igniter = true;
+			}
+		} else {
+			if (has_igniter) {
+				pane.remove(igniter);
+				has_igniter = false;
+			}
+		}
+
+		if (state.companion != null) {
+			if (!has_companion) {
+				pane.add("Companion", companion);
+				has_companion= true;
+			}
+		} else {
+			if (has_companion) {
+				pane.remove(companion);
+				has_companion = false;
+			}
+		}
+
 		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);
+
+		for (AltosFlightDisplay d : displays) {
+			try {
+				d.show(state, listener_state);
+			} catch (Exception e) {
+				System.out.printf("Exception showing %s\n", d.getName());
+				e.printStackTrace();
+			}
 		}
 	}
 
@@ -117,12 +170,18 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 		exit_on_close = true;
 	}
 
-	Container	bag;
-	AltosFreqList	frequencies;
-	JComboBox	telemetries;
+	Container		bag;
+	AltosUIFreqList		frequencies;
+	AltosUIRateList		rates;
+	AltosUITelemetryList	telemetries;
+	JLabel			telemetry;
+
+	ActionListener	show_timer;
 
 	public AltosFlightUI(AltosVoice in_voice, AltosFlightReader in_reader, final int serial) {
-		AltosPreferences.set_component(this);
+		AltosUIPreferences.set_component(this);
+
+		displays = new LinkedList<AltosFlightDisplay>();
 
 		voice = in_voice;
 		reader = in_reader;
@@ -130,18 +189,14 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 		bag = getContentPane();
 		bag.setLayout(new GridBagLayout());
 
-		GridBagConstraints c = new GridBagConstraints();
-
-		java.net.URL imgURL = AltosUI.class.getResource("/altus-metrum-16x16.jpg");
-		if (imgURL != null)
-			setIconImage(new ImageIcon(imgURL).getImage());
-
 		setTitle(String.format("AltOS %s", reader.name));
 
 		/* Stick channel selector at top of table for telemetry monitoring */
 		if (serial >= 0) {
-			// Channel menu
-			frequencies = new AltosFreqList(AltosPreferences.frequency(serial));
+			set_inset(3);
+
+			// Frequency menu
+			frequencies = new AltosUIFreqList(AltosUIPreferences.frequency(serial));
 			frequencies.set_product("Monitor");
 			frequencies.set_serial(serial);
 			frequencies.addActionListener(new ActionListener() {
@@ -155,46 +210,57 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 						reader.save_frequency();
 					}
 			});
-			c.gridx = 0;
-			c.gridy = 0;
-			c.insets = new Insets(3, 3, 3, 3);
-			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() {
+			bag.add (frequencies, constraints(0, 1));
+
+			// Telemetry rate list
+			rates = new AltosUIRateList(AltosUIPreferences.telemetry_rate(serial));
+			rates.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
-						int telemetry = telemetries.getSelectedIndex() + 1;
-						reader.set_telemetry(telemetry);
-						reader.save_telemetry();
+						int rate = rates.rate();
+						try {
+							reader.set_telemetry_rate(rate);
+						} catch (TimeoutException te) {
+						} catch (InterruptedException ie) {
+						}
+						reader.save_telemetry_rate();
 					}
 				});
-			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);
+			rates.setEnabled(reader.supports_telemetry_rate(AltosLib.ao_telemetry_rate_2400));
+			bag.add (rates, constraints(1, 1));
+
+			// Telemetry format list
+			if (reader.supports_telemetry(Altos.ao_telemetry_standard)) {
+				telemetries = new AltosUITelemetryList(serial);
+				telemetries.addActionListener(new ActionListener() {
+						public void actionPerformed(ActionEvent e) {
+							int telemetry = telemetries.get_selected();
+							reader.set_telemetry(telemetry);
+							reader.save_telemetry();
+						}
+					});
+				bag.add (telemetries, constraints(2, 1));
+			} 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);
+				bag.add (telemetry, constraints(2, 1));
+			}
+			next_row();
 		}
+		set_inset(0);
 
 		/* Flight status is always visible */
 		flightStatus = new AltosFlightStatus();
-		c.gridx = 0;
-		c.gridy = 1;
-		c.fill = GridBagConstraints.HORIZONTAL;
-		c.weightx = 1;
-		c.gridwidth = 2;
-		bag.add(flightStatus, c);
-		c.gridwidth = 1;
+		displays.add(flightStatus);
+		bag.add(flightStatus, constraints(0, 4, GridBagConstraints.HORIZONTAL));
+		next_row();
 
 		/* The rest of the window uses a tabbed pane to
 		 * show one of the alternate data views
@@ -202,39 +268,52 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 		pane = new JTabbedPane();
 
 		pad = new AltosPad();
-		pane.add("Launch Pad", pad);
+		displays.add(pad);
+		pane.add("Status", pad);
 
+		igniter = new AltosIgnitor();
+		displays.add(igniter);
 		ascent = new AltosAscent();
-		pane.add("Ascent", ascent);
-
+		displays.add(ascent);
 		descent = new AltosDescent();
-		pane.add("Descent", descent);
-
-		landed = new AltosLanded();
-		pane.add("Landed", landed);
+		displays.add(descent);
+		landed = new AltosLanded(reader);
+		displays.add(landed);
 
 		flightInfo = new AltosInfoTable();
+		displays.add(flightInfo);
 		pane.add("Table", new JScrollPane(flightInfo));
 
-		sitemap = new AltosSiteMap();
+		companion = new AltosCompanionInfo();
+		displays.add(companion);
+		has_companion = false;
+		has_state = false;
+
+		sitemap = new AltosUIMap();
+		displays.add(sitemap);
 		has_map = false;
 
 		/* Make the tabbed pane use the rest of the window space */
-		c.gridx = 0;
-		c.gridy = 2;
-		c.fill = GridBagConstraints.BOTH;
-		c.weightx = 1;
-		c.weighty = 1;
-		c.gridwidth = 2;
-		bag.add(pane, c);
+		bag.add(pane, constraints(0, 4, GridBagConstraints.BOTH));
 
 		setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
+
+		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();
+					AltosUIPreferences.unregister_font_listener(AltosFlightUI.this);
+					AltosPreferences.unregister_units_listener(AltosFlightUI.this);
 					if (exit_on_close)
 						System.exit(0);
 				}