X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosDescent.java;h=e73d990cb5ccde177ee73e818ae5514b30195c6a;hp=addd687810e4622352df37c3ad987a70b6791a69;hb=2ad31bad20b20615e9d8b29088e2488fddc81ac9;hpb=2c121f1ef495e8af3eb39210baa40e212b691894

diff --git a/altosui/AltosDescent.java b/altosui/AltosDescent.java
index addd6878..e73d990c 100644
--- a/altosui/AltosDescent.java
+++ b/altosui/AltosDescent.java
@@ -18,15 +18,8 @@
 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_2.*;
 
 public class AltosDescent extends JComponent implements AltosFlightDisplay {
 	GridBagLayout	layout;
@@ -36,7 +29,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 		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 +37,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,6 +57,11 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 			lights.set(false);
 		}
 
+		void set_font() {
+			label.setFont(Altos.label_font);
+			value.setFont(Altos.value_font);
+		}
+
 		public DescentStatus (GridBagLayout layout, int y, String text) {
 			GridBagConstraints	c = new GridBagConstraints();
 			c.weighty = 1;
@@ -101,7 +108,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 			value.setText("");
 		}
 
-		abstract void show(AltosState state, int crc_errors);
+		abstract void show(AltosState state, AltosListenerState listener_state);
 
 		void show() {
 			label.setVisible(true);
@@ -113,12 +120,22 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 			value.setVisible(false);
 		}
 
+		void show(String v) {
+			show();
+			value.setText(v);
+		}
+
+		void show(AltosUnits units, double v) {
+			show(units.show(8, v));
+		}
+
 		void show(String format, double v) {
-			value.setText(String.format(format, v));
+			show(String.format(format, v));
 		}
 
-		void show(String v) {
-			value.setText(v);
+		void set_font() {
+			label.setFont(Altos.label_font);
+			value.setFont(Altos.value_font);
 		}
 
 		public DescentValue (GridBagLayout layout, int x, int y, String text) {
@@ -169,7 +186,13 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 			value2.setVisible(false);
 		}
 
-		abstract void show(AltosState state, int crc_errors);
+		void set_font() {
+			label.setFont(Altos.label_font);
+			value1.setFont(Altos.value_font);
+			value2.setFont(Altos.value_font);
+		}
+
+		abstract void show(AltosState state, AltosListenerState listener_state);
 
 		void show(String v1, String v2) {
 			show();
@@ -221,8 +244,8 @@ 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(AltosConvert.height, state.height());
 		}
 		public Height (GridBagLayout layout, int x, int y) {
 			super (layout, x, y, "Height");
@@ -232,11 +255,8 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 	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(AltosConvert.speed, state.speed());
 		}
 		public Speed (GridBagLayout layout, int x, int y) {
 			super (layout, x, y, "Speed");
@@ -257,8 +277,8 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 	}
 
 	class Lat extends DescentValue {
-		void show (AltosState state, int crc_errors) {
-			if (state.gps != null)
+		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("???");
@@ -271,8 +291,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)
+		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("???");
@@ -284,10 +304,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(AltosConvert.distance, state.from_pad.distance);
+			else
+				show("???");
+		}
+
+		public Distance (GridBagLayout layout, int x, int y) {
+			super(layout, x, y, "Ground Distance");
+		}
+	}
+
+	Distance distance;
+		
+
 	class Apogee extends DescentStatus {
-		void show (AltosState state, int crc_errors) {
-			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");
@@ -297,10 +333,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");
@@ -310,7 +345,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(
@@ -327,8 +362,8 @@ 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(AltosConvert.distance, state.range);
 		}
 		public Range (GridBagLayout layout, int x, int y) {
 			super (layout, x, y, "Range");
@@ -338,7 +373,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 	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) {
@@ -355,29 +390,55 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 		speed.reset();
 		bearing.reset();
 		range.reset();
+		distance.reset();
 		elevation.reset();
 		main.reset();
 		apogee.reset();
 	}
 
-	public void show(AltosState state, int crc_errors) {
-		height.show(state, crc_errors);
-		speed.show(state, crc_errors);
-		if (state.gps != null) {
-			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);
+	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 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, 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();
 		}
-		main.show(state, crc_errors);
-		apogee.show(state, crc_errors);
+		if (state.main_voltage != AltosLib.MISSING)
+			main.show(state, listener_state);
+		else
+			main.hide();
+		if (state.apogee_voltage != AltosLib.MISSING)
+			apogee.show(state, listener_state);
+		else
+			apogee.hide();
+	}
+
+	public String getName() {
+		return "Descent";
 	}
 
 	public AltosDescent() {
@@ -391,10 +452,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);
 	}
 }