1 files changed, 95 insertions, 366 deletions

diff --git a/altosui/AltosPad.java b/altosui/AltosPad.java
index 3294949c..6b5fd150 100644
--- a/altosui/AltosPad.java
+++ b/altosui/AltosPad.java
@@ -17,280 +17,73 @@
 
 package altosui;
 
-import java.awt.*;
-import javax.swing.*;
+import java.util.*;
 import org.altusmetrum.altoslib_4.*;
 import org.altusmetrum.altosuilib_2.*;
 
-public class AltosPad extends JComponent implements AltosFlightDisplay {
-	GridBagLayout	layout;
+public class AltosPad extends AltosUIFlightTab {
 
-	public class LaunchStatus implements AltosFontListener, AltosUnitsListener {
-		JLabel		label;
-		JTextField	value;
-		AltosLights	lights;
-
-		void show(AltosState state, AltosListenerState listener_state) {}
-
-		void reset() {
-			value.setText("");
-			lights.set(false);
-		}
-
-		public void show() {
-			label.setVisible(true);
-			value.setVisible(true);
-			lights.setVisible(true);
-		}
-
-		void show(String s) {
-			show();
-			value.setText(s);
-		}
-
-		void show(String format, double value) {
-			show(String.format(format, value));
-		}
-
-		void show(String format, int value) {
-			show(String.format(format, value));
-		}
-
-		public void hide() {
-			label.setVisible(false);
-			value.setVisible(false);
-			lights.setVisible(false);
-		}
-
-		public void font_size_changed(int font_size) {
-			label.setFont(Altos.label_font);
-			value.setFont(Altos.value_font);
-		}
-
-		public void units_changed(boolean imperial_units) {
-		}
-
-		public void set_label(String text) {
-			label.setText(text);
-		}
-
-		public LaunchStatus (GridBagLayout layout, int y, String text) {
-			GridBagConstraints	c = new GridBagConstraints();
-			c.weighty = 1;
-
-			lights = new AltosLights();
-			c.gridx = 0; c.gridy = y;
-			c.anchor = GridBagConstraints.CENTER;
-			c.fill = GridBagConstraints.VERTICAL;
-			c.weightx = 0;
-			layout.setConstraints(lights, c);
-			add(lights);
-
-			label = new JLabel(text);
-			label.setFont(Altos.label_font);
-			label.setHorizontalAlignment(SwingConstants.LEFT);
-			c.gridx = 1; c.gridy = y;
-			c.insets = new Insets(Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad);
-			c.anchor = GridBagConstraints.WEST;
-			c.fill = GridBagConstraints.VERTICAL;
-			c.weightx = 0;
-			layout.setConstraints(label, c);
-			add(label);
-
-			value = new JTextField(Altos.text_width);
-			value.setEditable(false);
-			value.setFont(Altos.value_font);
-			value.setHorizontalAlignment(SwingConstants.RIGHT);
-			c.gridx = 2; c.gridy = y;
-			c.anchor = GridBagConstraints.WEST;
-			c.fill = GridBagConstraints.BOTH;
-			c.weightx = 1;
-			layout.setConstraints(value, c);
-			add(value);
-
-		}
+	class Battery extends AltosUIVoltageIndicator {
+		public double voltage(AltosState state) { return state.battery_voltage; }
+		public double good() { return AltosLib.ao_battery_good; }
+		public Battery (AltosUIFlightTab container, int y) { super(container, y, "Battery Voltage", 2); }
 	}
 
-	public abstract class LaunchValue implements AltosFontListener, AltosUnitsListener {
-		JLabel		label;
-		JTextField	value;
-		AltosUnits 	units;
-		double		v;
-
-		abstract void show(AltosState state, AltosListenerState listener_state);
-
-		void show() {
-			label.setVisible(true);
-			value.setVisible(true);
-		}
-
-		void hide() {
-			label.setVisible(false);
-			value.setVisible(false);
-		}
-
-		public void font_size_changed(int font_size) {
-			label.setFont(Altos.label_font);
-			value.setFont(Altos.value_font);
-		}
-
-		public void units_changed(boolean imperial_units) {
-			if (units != null)
-				show(v);
-		}
-
-		void show(String s) {
-			show();
-			value.setText(s);
-		}
-
-		void show(double v) {
-			this.v = v;
-			show(units.show(8, v));
-		}
-
-		void show(String format, double v) {
-			show(String.format(format, v));
-		}
-
-		public void set_label(String text) {
-			label.setText(text);
-		}
-
-		void reset() {
-			value.setText("");
-		}
-
-		public LaunchValue (GridBagLayout layout, int y, AltosUnits units, String text) {
-			this.units = units;
-
-			GridBagConstraints	c = new GridBagConstraints();
-			c.insets = new Insets(Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad);
-			c.weighty = 1;
-
-			label = new JLabel(text);
-			label.setFont(Altos.label_font);
-			label.setHorizontalAlignment(SwingConstants.LEFT);
-			c.gridx = 1; c.gridy = y;
-			c.anchor = GridBagConstraints.WEST;
-			c.fill = GridBagConstraints.VERTICAL;
-			c.weightx = 0;
-			layout.setConstraints(label, c);
-			add(label);
-
-			value = new JTextField(Altos.text_width);
-			value.setEditable(false);
-			value.setFont(Altos.value_font);
-			value.setHorizontalAlignment(SwingConstants.RIGHT);
-			c.gridx = 2; c.gridy = y;
-			c.anchor = GridBagConstraints.EAST;
-			c.fill = GridBagConstraints.BOTH;
-			c.weightx = 1;
-			layout.setConstraints(value, c);
-			add(value);
-		}
-
-		public LaunchValue (GridBagLayout layout, int y, String text) {
-			this(layout, y, null, text);
-		}
+	class Apogee extends AltosUIVoltageIndicator {
+		public boolean hide(double v) { return v == AltosLib.MISSING; }
+		public double voltage(AltosState state) { return state.apogee_voltage; }
+		public double good() { return AltosLib.ao_igniter_good; }
+		public Apogee (AltosUIFlightTab container, int y) { super(container, y, "Apogee Igniter Voltage", 2); }
 	}
 
-	class Voltage extends LaunchStatus {
-
-		double voltage(AltosState state) { return AltosLib.MISSING; };
-		double good() { return 0; };
-
-		double	last_voltage = -1;
-
-		void show (AltosState state, AltosListenerState listener_state) {
-			double	voltage = AltosLib.MISSING;
-			if (state != null)
-				voltage = voltage(state);
-
-			if (voltage != last_voltage) {
-				if (voltage == AltosLib.MISSING)
-					hide();
-				else {
-					show("%4.2f V", voltage);
-					lights.set(voltage >= good());
-				}
-				last_voltage = voltage;
-			}
-		}
-		public Voltage (GridBagLayout layout, int y, String name) { super(layout, y, name); }
-	}
-
-
-	class Battery extends Voltage {
-		double voltage(AltosState state) { return state.battery_voltage; }
-		double good() { return AltosLib.ao_battery_good; }
-
-		public Battery (GridBagLayout layout, int y) {
-			super(layout, y, "Battery Voltage");
-		}
-
+	class Main extends AltosUIVoltageIndicator {
+		public boolean hide(double v) { return v == AltosLib.MISSING; }
+		public double voltage(AltosState state) { return state.main_voltage; }
+		public double good() { return AltosLib.ao_igniter_good; }
+		public Main (AltosUIFlightTab container, int y) { super(container, y, "Main Igniter Voltage", 2); }
 	}
 
-	Battery	battery;
-
-	class Apogee extends Voltage {
-		double voltage(AltosState state) { return state.apogee_voltage; }
-		double good() { return AltosLib.ao_igniter_good; }
-		public Apogee (GridBagLayout layout, int y) { super(layout, y, "Apogee Igniter Voltage"); }
-	}
-
-	Apogee apogee;
-
-	class Main extends  Voltage {
-		double voltage(AltosState state) { return state.main_voltage; }
-		double good() { return AltosLib.ao_igniter_good; }
-		public Main (GridBagLayout layout, int y) { super(layout, y, "Main Igniter Voltage"); }
-	}
-
-	Main main;
-
-	class LoggingReady extends LaunchStatus {
-		void show (AltosState state, AltosListenerState listener_state) {
+	class LoggingReady extends AltosUIIndicator {
+		public void show (AltosState state, AltosListenerState listener_state) {
 			if (state == null || state.flight == AltosLib.MISSING) {
 				hide();
 			} else {
 				if (state.flight != 0) {
 					if (state.state <= Altos.ao_flight_pad)
 						show("Ready to record");
-					else if (state.state < Altos.ao_flight_landed)
+					else if (state.state < Altos.ao_flight_landed ||
+						 state.state == AltosLib.ao_flight_stateless)
 						show("Recording data");
 					else
 						show("Recorded data");
 				} else
 					show("Storage full");
-				lights.set(state.flight != 0);
+				set_lights(state.flight != 0);
 			}
 		}
-		public LoggingReady (GridBagLayout layout, int y) {
-			super(layout, y, "On-board Data Logging");
+		public LoggingReady (AltosUIFlightTab container, int y) {
+			super(container, y, "On-board Data Logging", 1, true, 2);
 		}
 	}
 
-	LoggingReady logging_ready;
-
-	class GPSLocked extends LaunchStatus {
-		void show (AltosState state, AltosListenerState listener_state) {
+	class GPSLocked extends AltosUIIndicator {
+		public void show (AltosState state, AltosListenerState listener_state) {
 			if (state == null || state.gps == null)
 				hide();
 			else {
-				show("%4d sats", state.gps.nsat);
-				lights.set(state.gps.locked && state.gps.nsat >= 4);
+				int	sol = state.gps.nsat;
+				int	sat = state.gps.cc_gps_sat == null ? 0 : state.gps.cc_gps_sat.length;
+				show("%d in solution", sol, "%d in view", sat);
+				set_lights(state.gps.locked && sol >= 4);
 			}
 		}
-		public GPSLocked (GridBagLayout layout, int y) {
-			super (layout, y, "GPS Locked");
+		public GPSLocked (AltosUIFlightTab container, int y) {
+			super (container, y, "GPS Locked", 2, true, 1);
 		}
 	}
 
-	GPSLocked gps_locked;
-
-	class GPSReady extends LaunchStatus {
-		void show (AltosState state, AltosListenerState listener_state) {
+	class GPSReady extends AltosUIIndicator {
+		public void show (AltosState state, AltosListenerState listener_state) {
 			if (state == null || state.gps == null)
 				hide();
 			else {
@@ -298,48 +91,37 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 					show("Ready");
 				else
 					show("Waiting %d", state.gps_waiting);
-				lights.set(state.gps_ready);
+				set_lights(state.gps_ready);
 			}
 		}
-		public GPSReady (GridBagLayout layout, int y) {
-			super (layout, y, "GPS Ready");
+		public GPSReady (AltosUIFlightTab container, int y) {
+			super (container, y, "GPS Ready", 1, true, 2);
 		}
 	}
 
-	GPSReady gps_ready;
+	class ReceiverBattery extends AltosUIVoltageIndicator {
 
-	class ReceiverBattery extends LaunchStatus {
-		void show (AltosState state, AltosListenerState listener_state) {
-			if (listener_state == null || listener_state.battery == AltosLib.MISSING)
-				hide();
-			else {
-				show("%4.2f V", listener_state.battery);
-				lights.set(listener_state.battery > AltosLib.ao_battery_good);
-			}
-		}
-		public ReceiverBattery (GridBagLayout layout, int y) {
-			super(layout, y, "Receiver Battery");
-		}
-	}
+		public double voltage(AltosState state) { return AltosLib.MISSING; }
+
+		public boolean hide(double v) { return v == AltosLib.MISSING; }
+		public double good() { return AltosLib.ao_battery_good; }
 
-	ReceiverBattery	receiver_battery;
+		public double value(AltosState state, AltosListenerState listener_state, int i) {
+			if (listener_state == null)
+				return AltosLib.MISSING;
+			return listener_state.battery;
+		}
 
-	String pos(double p, String pos, String neg) {
-		String	h = pos;
-		if (p < 0) {
-			h = neg;
-			p = -p;
+		public ReceiverBattery (AltosUIFlightTab container, int y) {
+			super(container, y, "Receiver Battery", 2);
 		}
-		int deg = (int) Math.floor(p);
-		double min = (p - Math.floor(p)) * 60.0;
-		return String.format("%s %4d° %9.6f", h, deg, min);
 	}
 
-	class PadLat extends LaunchValue {
+	class PadLat extends AltosUIIndicator {
 
-		double	last_lat = 1000;
+		double	last_lat = AltosLib.MISSING - 1;
 
-		void show (AltosState state, AltosListenerState listener_state) {
+		public void show (AltosState state, AltosListenerState listener_state) {
 			double lat = AltosLib.MISSING;
 			String label = null;
 
@@ -354,25 +136,29 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 			}
 			if (lat != last_lat) {
 				if (lat != AltosLib.MISSING) {
-					show(pos(lat,"N", "S"));
+					show(AltosConvert.latitude.show(10, lat));
 					set_label(label);
 				} else
 					hide();
 				last_lat = lat;
 			}
 		}
-		public PadLat (GridBagLayout layout, int y) {
-			super (layout, y, "Pad Latitude");
+
+		public void reset() {
+			super.reset();
+			last_lat = AltosLib.MISSING - 1;
 		}
-	}
 
-	PadLat pad_lat;
+		public PadLat (AltosUIFlightTab container, int y) {
+			super (container, y, "Pad Latitude", 1, false, 2);
+		}
+	}
 
-	class PadLon extends LaunchValue {
+	class PadLon extends AltosUIIndicator {
 
-		double last_lon = 1000;
+		double last_lon = AltosLib.MISSING - 1;
 
-		void show (AltosState state, AltosListenerState listener_state) {
+		public void show (AltosState state, AltosListenerState listener_state) {
 			double lon = AltosLib.MISSING;
 			String label = null;
 
@@ -387,25 +173,29 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 			}
 			if (lon != last_lon) {
 				if (lon != AltosLib.MISSING) {
-					show(pos(lon,"E", "W"));
+					show(AltosConvert.longitude.show(10, lon));
 					set_label(label);
 				} else
 					hide();
 				last_lon = lon;
 			}
 		}
-		public PadLon (GridBagLayout layout, int y) {
-			super (layout, y, "Pad Longitude");
+
+		public void reset() {
+			super.reset();
+			last_lon = AltosLib.MISSING - 1;
 		}
-	}
 
-	PadLon pad_lon;
+		public PadLon (AltosUIFlightTab container, int y) {
+			super (container, y, "Pad Longitude", 1, false, 2);
+		}
+	}
 
-	class PadAlt extends LaunchValue {
+	class PadAlt extends AltosUIIndicator {
 
-		double	last_alt = -1000000;
+		double	last_alt = AltosLib.MISSING - 1;
 
-		void show (AltosState state, AltosListenerState listener_state) {
+		public void show (AltosState state, AltosListenerState listener_state) {
 			double alt = AltosLib.MISSING;
 			String label = null;
 
@@ -420,97 +210,36 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 			}
 			if (alt != last_alt) {
 				if (alt != AltosLib.MISSING) {
-					show(alt);
+					show(AltosConvert.height.show(5, alt));
 					set_label(label);
 				} else
 					hide();
 				last_alt = alt;
 			}
 		}
-		public PadAlt (GridBagLayout layout, int y) {
-			super (layout, y, AltosConvert.height, "Pad Altitude");
-		}
-	}
-
-	PadAlt pad_alt;
-
-	public void reset() {
-		battery.reset();
-		apogee.reset();
-		main.reset();
-		logging_ready.reset();
-		gps_locked.reset();
-		gps_ready.reset();
-		receiver_battery.reset();
-		pad_lat.reset();
-		pad_lon.reset();
-		pad_alt.reset();
-	}
 
-	public void font_size_changed(int font_size) {
-		battery.font_size_changed(font_size);
-		apogee.font_size_changed(font_size);
-		main.font_size_changed(font_size);
-		logging_ready.font_size_changed(font_size);
-		gps_locked.font_size_changed(font_size);
-		gps_ready.font_size_changed(font_size);
-		receiver_battery.font_size_changed(font_size);
-		pad_lat.font_size_changed(font_size);
-		pad_lon.font_size_changed(font_size);
-		pad_alt.font_size_changed(font_size);
-	}
-
-	public void units_changed(boolean imperial_units) {
-		battery.units_changed(imperial_units);
-		apogee.units_changed(imperial_units);
-		main.units_changed(imperial_units);
-		logging_ready.units_changed(imperial_units);
-		gps_locked.units_changed(imperial_units);
-		gps_ready.units_changed(imperial_units);
-		receiver_battery.units_changed(imperial_units);
-		pad_lat.units_changed(imperial_units);
-		pad_lon.units_changed(imperial_units);
-		pad_alt.units_changed(imperial_units);
-	}
+		public void reset() {
+			super.reset();
+			last_alt =  AltosLib.MISSING - 1;
+		}
 
-	public void show(AltosState state, AltosListenerState listener_state) {
-		battery.show(state, listener_state);
-		apogee.show(state, listener_state);
-		main.show(state, listener_state);
-		logging_ready.show(state, listener_state);
-		pad_alt.show(state, listener_state);
-		receiver_battery.show(state, listener_state);
-		gps_locked.show(state, listener_state);
-		gps_ready.show(state, listener_state);
-		pad_lat.show(state, listener_state);
-		pad_lon.show(state, listener_state);
+		public PadAlt (AltosUIFlightTab container, int y) {
+			super (container, y, "Pad Altitude", 1, false, 2);
+		}
 	}
+	public String getName() { return "Pad"; }
 
 	public AltosPad() {
-		layout = new GridBagLayout();
-
-		setLayout(layout);
-
-		/* Elements in pad display:
-		 *
-		 * Battery voltage
-		 * Igniter continuity
-		 * GPS lock status
-		 * GPS ready status
-		 * GPS location
-		 * Pad altitude
-		 * RSSI
-		 */
-		battery = new Battery(layout, 0);
-		apogee = new Apogee(layout, 1);
-		main = new Main(layout, 2);
-		logging_ready = new LoggingReady(layout, 3);
-		gps_locked = new GPSLocked(layout, 4);
-		gps_ready = new GPSReady(layout, 5);
-		receiver_battery = new ReceiverBattery(layout, 6);
-		pad_lat = new PadLat(layout, 7);
-		pad_lon = new PadLon(layout, 8);
-		pad_alt = new PadAlt(layout, 9);
-		show(null, null);
+		int y = 0;
+		add(new Battery(this, y++));
+		add(new Apogee(this, y++));
+		add(new Main(this, y++));
+		add(new LoggingReady(this, y++));
+		add(new GPSLocked(this, y++));
+		add(new GPSReady(this, y++));
+		add(new ReceiverBattery(this, y++));
+		add(new PadLat(this, y++));
+		add(new PadLon(this, y++));
+		add(new PadAlt(this, y++));
 	}
 }