X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosPad.java;h=ce1f2ab74c24f0b3539af1c8e8f8ec3961499399;hb=e0dfa934ba76d6f913af37999e05c20e614bd3e9;hp=b35bd23a8626f14032344b671dcd91575a385c1a;hpb=5b976a6651f4eb05d30afc08b9e1f27c7e52ae00;p=fw%2Faltos

diff --git a/altosui/AltosPad.java b/altosui/AltosPad.java
index b35bd23a..ce1f2ab7 100644
--- a/altosui/AltosPad.java
+++ b/altosui/AltosPad.java
@@ -19,12 +19,13 @@ package altosui;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_2.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;
 
 public class AltosPad extends JComponent implements AltosFlightDisplay {
 	GridBagLayout	layout;
 
-	public class LaunchStatus {
+	public class LaunchStatus implements AltosFontListener, AltosUnitsListener {
 		JLabel		label;
 		JTextField	value;
 		AltosLights	lights;
@@ -61,15 +62,18 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 			lights.setVisible(false);
 		}
 
-		public 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 void set_label(String text) {
 			label.setText(text);
 		}
-		
+
 		public LaunchStatus (GridBagLayout layout, int y, String text) {
 			GridBagConstraints	c = new GridBagConstraints();
 			c.weighty = 1;
@@ -106,10 +110,13 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 		}
 	}
 
-	public class LaunchValue {
+	public abstract class LaunchValue implements AltosFontListener, AltosUnitsListener {
 		JLabel		label;
 		JTextField	value;
-		void show(AltosState state, AltosListenerState listener_state) {}
+		AltosUnits 	units;
+		double		v;
+
+		abstract void show(AltosState state, AltosListenerState listener_state);
 
 		void show() {
 			label.setVisible(true);
@@ -121,17 +128,23 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 			value.setVisible(false);
 		}
 
-		public 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) {
+			if (units != null)
+				show(v);
+		}
+
 		void show(String s) {
 			show();
 			value.setText(s);
 		}
 
-		void show(AltosUnits units, double v) {
+		void show(double v) {
+			this.v = v;
 			show(units.show(8, v));
 		}
 
@@ -142,12 +155,14 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 		public void set_label(String text) {
 			label.setText(text);
 		}
-		
+
 		void reset() {
 			value.setText("");
 		}
 
-		public LaunchValue (GridBagLayout layout, int y, String text) {
+		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;
@@ -172,6 +187,10 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 			layout.setConstraints(value, c);
 			add(value);
 		}
+
+		public LaunchValue (GridBagLayout layout, int y, String text) {
+			this(layout, y, null, text);
+		}
 	}
 
 	class Battery extends LaunchStatus {
@@ -180,7 +199,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 				hide();
 			else {
 				show("%4.2f V", state.battery_voltage);
-				lights.set(state.battery_voltage > 3.7);
+				lights.set(state.battery_voltage >= AltosLib.ao_battery_good);
 			}
 		}
 		public Battery (GridBagLayout layout, int y) {
@@ -196,7 +215,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 				hide();
 			else {
 				show("%4.2f V", state.apogee_voltage);
-				lights.set(state.apogee_voltage > 3.7);
+				lights.set(state.apogee_voltage >= AltosLib.ao_igniter_good);
 			}
 		}
 		public Apogee (GridBagLayout layout, int y) {
@@ -212,7 +231,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 				hide();
 			else {
 				show("%4.2f V", state.main_voltage);
-				lights.set(state.main_voltage > 3.7);
+				lights.set(state.main_voltage >= AltosLib.ao_igniter_good);
 			}
 		}
 		public Main (GridBagLayout layout, int y) {
@@ -287,7 +306,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 				hide();
 			else {
 				show("%4.2f V", listener_state.battery);
-				lights.set(listener_state.battery > 3.7);
+				lights.set(listener_state.battery > AltosLib.ao_battery_good);
 			}
 		}
 		public ReceiverBattery (GridBagLayout layout, int y) {
@@ -377,13 +396,13 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 				}
 			}
 			if (alt != AltosLib.MISSING) {
-				show("%4.0f m", state.gps.alt);
+				show(alt);
 				set_label(label);
 			} else
 				hide();
 		}
 		public PadAlt (GridBagLayout layout, int y) {
-			super (layout, y, "Pad Altitude");
+			super (layout, y, AltosConvert.height, "Pad Altitude");
 		}
 	}
 
@@ -402,19 +421,32 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 		pad_alt.reset();
 	}
 
-	public void set_font() {
-		battery.set_font();
-		apogee.set_font();
-		main.set_font();
-		logging_ready.set_font();
-		gps_locked.set_font();
-		gps_ready.set_font();
-		receiver_battery.set_font();
-		pad_lat.set_font();
-		pad_lon.set_font();
-		pad_alt.set_font();
+	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 show(AltosState state, AltosListenerState listener_state) {
 		battery.show(state, listener_state);
 		apogee.show(state, listener_state);