X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosDescent.java;h=e6710524ec03647e5c77ba38732124d60e291f4d;hb=e0dfa934ba76d6f913af37999e05c20e614bd3e9;hp=29d33ddc9afac6085b9426bb8b37928274892987;hpb=398c02b945a58634c8932f07df2c2be8438da7d1;p=fw%2Faltos

diff --git a/altosui/AltosDescent.java b/altosui/AltosDescent.java
index 29d33ddc..e6710524 100644
--- a/altosui/AltosDescent.java
+++ b/altosui/AltosDescent.java
@@ -19,12 +19,13 @@ package altosui;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_1.*;
+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;
@@ -57,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;
@@ -100,9 +104,11 @@ 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("");
@@ -125,7 +131,8 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 			value.setText(v);
 		}
 
-		void show(AltosUnits units, double v) {
+		void show(double v) {
+			this.v = v;
 			show(units.show(8, v));
 		}
 
@@ -133,12 +140,18 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 			show(String.format(format, v));
 		}
 
-		void set_font() {
+		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;
 
@@ -162,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;
@@ -186,12 +203,15 @@ 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);
 		}
 
+		public void units_changed(boolean imperial_units) {
+		}
+
 		abstract void show(AltosState state, AltosListenerState listener_state);
 
 		void show(String v1, String v2) {
@@ -245,10 +265,10 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 
 	class Height extends DescentValue {
 		void show (AltosState state, AltosListenerState listener_state) {
-			show(AltosConvert.height, state.height);
+			show(state.height());
 		}
 		public Height (GridBagLayout layout, int x, int y) {
-			super (layout, x, y, "Height");
+			super (layout, x, y, AltosConvert.height, "Height");
 		}
 	}
 
@@ -256,13 +276,10 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 
 	class Speed extends DescentValue {
 		void show (AltosState state, AltosListenerState listener_state) {
-			double speed = state.accel_speed;
-			if (!state.ascent)
-				speed = state.baro_speed;
-			show(AltosConvert.speed, speed);
+			show(state.speed());
 		}
 		public Speed (GridBagLayout layout, int x, int y) {
-			super (layout, x, y, "Speed");
+			super (layout, x, y, AltosConvert.speed, "Speed");
 		}
 	}
 
@@ -281,7 +298,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 
 	class Lat extends DescentValue {
 		void show (AltosState state, AltosListenerState listener_state) {
-			if (state.gps != null && state.gps.connected)
+			if (state.gps != null && state.gps.connected && state.gps.lat != AltosLib.MISSING)
 				show(pos(state.gps.lat,"N", "S"));
 			else
 				show("???");
@@ -295,7 +312,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 
 	class Lon extends DescentValue {
 		void show (AltosState state, AltosListenerState listener_state) {
-			if (state.gps != null && state.gps.connected)
+			if (state.gps != null && state.gps.connected && state.gps.lon != AltosLib.MISSING)
 				show(pos(state.gps.lon,"W", "E"));
 			else
 				show("???");
@@ -310,23 +327,23 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 	class Distance extends DescentValue {
 		void show(AltosState state, AltosListenerState listener_state) {
 			if (state.from_pad != null)
-				show(AltosConvert.distance, state.from_pad.distance);
+				show(state.from_pad.distance);
 			else
 				show("???");
 		}
 
 		public Distance (GridBagLayout layout, int x, int y) {
-			super(layout, x, y, "Ground Distance");
+			super(layout, x, y, AltosConvert.distance, "Ground Distance");
 		}
 	}
 
 	Distance distance;
-		
+
 
 	class Apogee extends DescentStatus {
 		void show (AltosState state, AltosListenerState listener_state) {
-			show("%4.2f V", state.drogue_sense);
-			lights.set(state.drogue_sense > 3.2);
+			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");
@@ -337,8 +354,8 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 
 	class Main extends DescentStatus {
 		void show (AltosState state, AltosListenerState listener_state) {
-			show("%4.2f V", state.main_sense);
-			lights.set(state.main_sense > 3.2);
+			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");
@@ -366,10 +383,10 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 
 	class Range extends DescentValue {
 		void show (AltosState state, AltosListenerState listener_state) {
-			show(AltosConvert.distance, state.range);
+			show(state.range);
 		}
 		public Range (GridBagLayout layout, int x, int y) {
-			super (layout, x, y, "Range");
+			super (layout, x, y, AltosConvert.distance, "Range");
 		}
 	}
 
@@ -399,17 +416,30 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 		apogee.reset();
 	}
 
-	public void set_font() {
-		lat.set_font();
-		lon.set_font();
-		height.set_font();
-		speed.set_font();
-		bearing.set_font();
-		range.set_font();
-		distance.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 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) {
@@ -430,11 +460,11 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 			lat.hide();
 			lon.hide();
 		}
-		if (state.main_sense != AltosRecord.MISSING)
+		if (state.main_voltage != AltosLib.MISSING)
 			main.show(state, listener_state);
 		else
 			main.hide();
-		if (state.drogue_sense != AltosRecord.MISSING)
+		if (state.apogee_voltage != AltosLib.MISSING)
 			apogee.show(state, listener_state);
 		else
 			apogee.hide();