X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosDescent.java;h=e6710524ec03647e5c77ba38732124d60e291f4d;hb=e0dfa934ba76d6f913af37999e05c20e614bd3e9;hp=0fcd690b781180548e31c8d5f13cdcd209a414c0;hpb=3d88e0493ab446d7c7011786390d30618a72d045;p=fw%2Faltos

diff --git a/altosui/AltosDescent.java b/altosui/AltosDescent.java
index 0fcd690b..e6710524 100644
--- a/altosui/AltosDescent.java
+++ b/altosui/AltosDescent.java
@@ -18,25 +18,19 @@
 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.LinkedBlockingQueue;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;
 
 public class AltosDescent extends JComponent implements AltosFlightDisplay {
 	GridBagLayout	layout;
 
-	public abstract class DescentStatus {
+	public abstract class DescentStatus implements AltosFontListener, AltosUnitsListener {
 		JLabel		label;
 		JTextField	value;
 		AltosLights	lights;
 
-		abstract void show(AltosState state, int crc_errors);
+		abstract void show(AltosState state, AltosListenerState listener_state);
 
 		void show() {
 			label.setVisible(true);
@@ -44,6 +38,15 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 			lights.setVisible(true);
 		}
 
+		void show(String s) {
+			show();
+			value.setText(s);
+		}
+
+		void show(String format, double value) {
+			show(String.format(format, value));
+		}
+
 		void hide() {
 			label.setVisible(false);
 			value.setVisible(false);
@@ -55,11 +58,14 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 			lights.set(false);
 		}
 
-		void set_font() {
+		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 DescentStatus (GridBagLayout layout, int y, String text) {
 			GridBagConstraints	c = new GridBagConstraints();
 			c.weighty = 1;
@@ -98,15 +104,17 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 		}
 	}
 
-	public abstract class DescentValue {
+	public abstract class DescentValue implements AltosFontListener, AltosUnitsListener {
 		JLabel		label;
 		JTextField	value;
+		AltosUnits	units;
+		double		v;
 
 		void reset() {
 			value.setText("");
 		}
 
-		abstract void show(AltosState state, int crc_errors);
+		abstract void show(AltosState state, AltosListenerState listener_state);
 
 		void show() {
 			label.setVisible(true);
@@ -118,20 +126,32 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 			value.setVisible(false);
 		}
 
-		void show(String format, double v) {
-			value.setText(String.format(format, v));
-		}
-
 		void show(String v) {
+			show();
 			value.setText(v);
 		}
 
-		void set_font() {
+		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 font_size_changed(int font_size) {
 			label.setFont(Altos.label_font);
 			value.setFont(Altos.value_font);
 		}
 
-		public DescentValue (GridBagLayout layout, int x, int y, String text) {
+		public void units_changed(boolean imperial_units) {
+			if (units != null)
+				show(v);
+		}
+
+		public DescentValue (GridBagLayout layout, int x, int y, AltosUnits units, String text) {
+			this.units = units;
 			GridBagConstraints	c = new GridBagConstraints();
 			c.weighty = 1;
 
@@ -155,9 +175,13 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 			c.weightx = 1;
 			add(value, c);
 		}
+
+		public DescentValue (GridBagLayout layout, int x, int y, String text) {
+			this(layout, x, y, null, text);
+		}
 	}
 
-	public abstract class DescentDualValue {
+	public abstract class DescentDualValue implements AltosFontListener, AltosUnitsListener {
 		JLabel		label;
 		JTextField	value1;
 		JTextField	value2;
@@ -179,13 +203,16 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 			value2.setVisible(false);
 		}
 
-		void set_font() {
+		public void font_size_changed(int font_size) {
 			label.setFont(Altos.label_font);
 			value1.setFont(Altos.value_font);
 			value2.setFont(Altos.value_font);
 		}
 
-		abstract void show(AltosState state, int crc_errors);
+		public void units_changed(boolean imperial_units) {
+		}
+
+		abstract void show(AltosState state, AltosListenerState listener_state);
 
 		void show(String v1, String v2) {
 			show();
@@ -237,25 +264,22 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 	}
 
 	class Height extends DescentValue {
-		void show (AltosState state, int crc_errors) {
-			show("%6.0f m", state.height);
+		void show (AltosState state, AltosListenerState listener_state) {
+			show(state.height());
 		}
 		public Height (GridBagLayout layout, int x, int y) {
-			super (layout, x, y, "Height");
+			super (layout, x, y, AltosConvert.height, "Height");
 		}
 	}
 
 	Height	height;
 
 	class Speed extends DescentValue {
-		void show (AltosState state, int crc_errors) {
-			double speed = state.speed;
-			if (!state.ascent)
-				speed = state.baro_speed;
-			show("%6.0f m/s", speed);
+		void show (AltosState state, AltosListenerState listener_state) {
+			show(state.speed());
 		}
 		public Speed (GridBagLayout layout, int x, int y) {
-			super (layout, x, y, "Speed");
+			super (layout, x, y, AltosConvert.speed, "Speed");
 		}
 	}
 
@@ -273,8 +297,8 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 	}
 
 	class Lat extends DescentValue {
-		void show (AltosState state, int crc_errors) {
-			if (state.gps != null && state.gps.connected)
+		void show (AltosState state, AltosListenerState listener_state) {
+			if (state.gps != null && state.gps.connected && state.gps.lat != AltosLib.MISSING)
 				show(pos(state.gps.lat,"N", "S"));
 			else
 				show("???");
@@ -287,8 +311,8 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 	Lat lat;
 
 	class Lon extends DescentValue {
-		void show (AltosState state, int crc_errors) {
-			if (state.gps != null && state.gps.connected)
+		void show (AltosState state, AltosListenerState listener_state) {
+			if (state.gps != null && state.gps.connected && state.gps.lon != AltosLib.MISSING)
 				show(pos(state.gps.lon,"W", "E"));
 			else
 				show("???");
@@ -300,11 +324,26 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 
 	Lon lon;
 
+	class Distance extends DescentValue {
+		void show(AltosState state, AltosListenerState listener_state) {
+			if (state.from_pad != null)
+				show(state.from_pad.distance);
+			else
+				show("???");
+		}
+
+		public Distance (GridBagLayout layout, int x, int y) {
+			super(layout, x, y, AltosConvert.distance, "Ground Distance");
+		}
+	}
+
+	Distance distance;
+
+
 	class Apogee extends DescentStatus {
-		void show (AltosState state, int crc_errors) {
-			show();
-			value.setText(String.format("%4.2f V", state.drogue_sense));
-			lights.set(state.drogue_sense > 3.2);
+		void show (AltosState state, AltosListenerState listener_state) {
+			show("%4.2f V", state.apogee_voltage);
+			lights.set(state.apogee_voltage >= AltosLib.ao_igniter_good);
 		}
 		public Apogee (GridBagLayout layout, int y) {
 			super(layout, y, "Apogee Igniter Voltage");
@@ -314,10 +353,9 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 	Apogee apogee;
 
 	class Main extends DescentStatus {
-		void show (AltosState state, int crc_errors) {
-			show();
-			value.setText(String.format("%4.2f V", state.main_sense));
-			lights.set(state.main_sense > 3.2);
+		void show (AltosState state, AltosListenerState listener_state) {
+			show("%4.2f V", state.main_voltage);
+			lights.set(state.main_voltage >= AltosLib.ao_igniter_good);
 		}
 		public Main (GridBagLayout layout, int y) {
 			super(layout, y, "Main Igniter Voltage");
@@ -327,7 +365,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 	Main main;
 
 	class Bearing extends DescentDualValue {
-		void show (AltosState state, int crc_errors) {
+		void show (AltosState state, AltosListenerState listener_state) {
 			if (state.from_pad != null) {
 				show( String.format("%3.0f°", state.from_pad.bearing),
 				      state.from_pad.bearing_words(
@@ -344,18 +382,18 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 	Bearing bearing;
 
 	class Range extends DescentValue {
-		void show (AltosState state, int crc_errors) {
-			show("%6.0f m", state.range);
+		void show (AltosState state, AltosListenerState listener_state) {
+			show(state.range);
 		}
 		public Range (GridBagLayout layout, int x, int y) {
-			super (layout, x, y, "Range");
+			super (layout, x, y, AltosConvert.distance, "Range");
 		}
 	}
 
 	Range range;
 
 	class Elevation extends DescentValue {
-		void show (AltosState state, int crc_errors) {
+		void show (AltosState state, AltosListenerState listener_state) {
 			show("%3.0f°", state.elevation);
 		}
 		public Elevation (GridBagLayout layout, int x, int y) {
@@ -372,49 +410,70 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 		speed.reset();
 		bearing.reset();
 		range.reset();
+		distance.reset();
 		elevation.reset();
 		main.reset();
 		apogee.reset();
 	}
 
-	public void set_font() {
-		lat.set_font();
-		lon.set_font();
-		height.set_font();
-		speed.set_font();
-		bearing.set_font();
-		range.set_font();
-		elevation.set_font();
-		main.set_font();
-		apogee.set_font();
+	public void font_size_changed(int font_size) {
+		lat.font_size_changed(font_size);
+		lon.font_size_changed(font_size);
+		height.font_size_changed(font_size);
+		speed.font_size_changed(font_size);
+		bearing.font_size_changed(font_size);
+		range.font_size_changed(font_size);
+		distance.font_size_changed(font_size);
+		elevation.font_size_changed(font_size);
+		main.font_size_changed(font_size);
+		apogee.font_size_changed(font_size);
 	}
 
-	public void show(AltosState state, int crc_errors) {
-		height.show(state, crc_errors);
-		speed.show(state, crc_errors);
+	public void units_changed(boolean imperial_units) {
+		lat.units_changed(imperial_units);
+		lon.units_changed(imperial_units);
+		height.units_changed(imperial_units);
+		speed.units_changed(imperial_units);
+		bearing.units_changed(imperial_units);
+		range.units_changed(imperial_units);
+		distance.units_changed(imperial_units);
+		elevation.units_changed(imperial_units);
+		main.units_changed(imperial_units);
+		apogee.units_changed(imperial_units);
+	}
+
+	public void show(AltosState state, AltosListenerState listener_state) {
+		height.show(state, listener_state);
+		speed.show(state, listener_state);
 		if (state.gps != null && state.gps.connected) {
-			bearing.show(state, crc_errors);
-			range.show(state, crc_errors);
-			elevation.show(state, crc_errors);
-			lat.show(state, crc_errors);
-			lon.show(state, crc_errors);
+			bearing.show(state, listener_state);
+			range.show(state, listener_state);
+			distance.show(state, listener_state);
+			elevation.show(state, listener_state);
+			lat.show(state, listener_state);
+			lon.show(state, listener_state);
 		} else {
 			bearing.hide();
 			range.hide();
+			distance.hide();
 			elevation.hide();
 			lat.hide();
 			lon.hide();
 		}
-		if (state.main_sense != AltosRecord.MISSING)
-			main.show(state, crc_errors);
+		if (state.main_voltage != AltosLib.MISSING)
+			main.show(state, listener_state);
 		else
 			main.hide();
-		if (state.drogue_sense != AltosRecord.MISSING)
-			apogee.show(state, crc_errors);
+		if (state.apogee_voltage != AltosLib.MISSING)
+			apogee.show(state, listener_state);
 		else
 			apogee.hide();
 	}
 
+	public String getName() {
+		return "Descent";
+	}
+
 	public AltosDescent() {
 		layout = new GridBagLayout();
 
@@ -426,10 +485,11 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 		elevation = new Elevation(layout, 0, 1);
 		range = new Range(layout, 2, 1);
 		bearing = new Bearing(layout, 0, 2);
-		lat = new Lat(layout, 0, 3);
-		lon = new Lon(layout, 2, 3);
+		distance = new Distance(layout, 0, 3);
+		lat = new Lat(layout, 0, 4);
+		lon = new Lon(layout, 2, 4);
 
-		apogee = new Apogee(layout, 4);
-		main = new Main(layout, 5);
+		apogee = new Apogee(layout, 5);
+		main = new Main(layout, 6);
 	}
 }