X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosAscent.java;h=c8e5f3af07ea61fee1e21f4b8297fd22227d91d2;hp=8a4aa58b02de03234e4d070886ceaf208f84dcb6;hb=c3314dae2d3df82e188daf6ba8520cce833592c6;hpb=2c121f1ef495e8af3eb39210baa40e212b691894

diff --git a/altosui/AltosAscent.java b/altosui/AltosAscent.java
index 8a4aa58b..c8e5f3af 100644
--- a/altosui/AltosAscent.java
+++ b/altosui/AltosAscent.java
@@ -30,18 +30,36 @@ import java.util.concurrent.LinkedBlockingQueue;
 
 public class AltosAscent extends JComponent implements AltosFlightDisplay {
 	GridBagLayout	layout;
+	JLabel			cur, max;
 
 	public class AscentStatus {
 		JLabel		label;
 		JTextField	value;
 		AltosLights	lights;
 
+		void show() {
+			value.setVisible(true);
+			lights.setVisible(true);
+			label.setVisible(true);
+		}
+
+		void hide() {
+			value.setVisible(false);
+			lights.setVisible(false);
+			label.setVisible(false);
+		}
+
 		void show(AltosState state, int crc_errors) {}
 		void reset() {
 			value.setText("");
 			lights.set(false);
 		}
 
+		void set_font() {
+			label.setFont(Altos.label_font);
+			value.setFont(Altos.value_font);
+		}
+
 		public AscentStatus (GridBagLayout layout, int y, String text) {
 			GridBagConstraints	c = new GridBagConstraints();
 			c.weighty = 1;
@@ -97,6 +115,11 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 			label.setVisible(false);
 			value.setVisible(false);
 		}
+		void set_font() {
+			label.setFont(Altos.label_font);
+			value.setFont(Altos.value_font);
+		}
+
 		public AscentValue (GridBagLayout layout, int y, String text) {
 			GridBagConstraints	c = new GridBagConstraints();
 			c.weighty = 1;
@@ -136,14 +159,25 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 		void reset() {
 			value.setText("");
 			max_value.setText("");
-			max = 0;
+			max = AltosRecord.MISSING;
+		}
+
+		void set_font() {
+			label.setFont(Altos.label_font);
+			value.setFont(Altos.value_font);
+			max_value.setFont(Altos.value_font);
 		}
 
 		void show(String format, double v) {
-			value.setText(String.format(format, v));
-			if (v > max) {
-				max_value.setText(String.format(format, v));
-				max = v;
+			if (v == AltosRecord.MISSING) {
+				value.setText("Missing");
+				max_value.setText("Missing");
+			} else {
+				value.setText(String.format(format, v));
+				if (v > max || max == AltosRecord.MISSING) {
+					max_value.setText(String.format(format, v));
+					max = v;
+				}
 			}
 		}
 		public AscentValueHold (GridBagLayout layout, int y, String text) {
@@ -233,6 +267,7 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 
 	class Apogee extends AscentStatus {
 		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);
 		}
@@ -245,6 +280,7 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 
 	class Main extends AscentStatus {
 		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);
 		}
@@ -295,8 +331,20 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 		accel.reset();
 	}
 
+	public void set_font() {
+		cur.setFont(Altos.label_font);
+		max.setFont(Altos.label_font);
+		lat.set_font();
+		lon.set_font();
+		main.set_font();
+		apogee.set_font();
+		height.set_font();
+		speed.set_font();
+		accel.set_font();
+	}
+
 	public void show(AltosState state, int crc_errors) {
-		if (state.gps != null) {
+		if (state.gps != null && state.gps.connected) {
 			lat.show(state, crc_errors);
 			lon.show(state, crc_errors);
 		} else {
@@ -304,15 +352,20 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 			lon.hide();
 		}
 		height.show(state, crc_errors);
-		main.show(state, crc_errors);
-		apogee.show(state, crc_errors);
+		if (state.main_sense != AltosRecord.MISSING)
+			main.show(state, crc_errors);
+		else
+			main.hide();
+		if (state.drogue_sense != AltosRecord.MISSING)
+			apogee.show(state, crc_errors);
+		else
+			apogee.hide();
 		speed.show(state, crc_errors);
 		accel.show(state, crc_errors);
 	}
 
 	public void labels(GridBagLayout layout, int y) {
 		GridBagConstraints	c;
-		JLabel			cur, max;
 
 		cur = new JLabel("Current");
 		cur.setFont(Altos.label_font);