X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosAscent.java;h=d607b0c50aeff986137282c43fa4aeaef2e41da7;hp=64bdcf3097cc5eae63ad395e96eded6ef6ad4a9f;hb=578c4b17b8f62f2727654ebda78ee139f9fe13fa;hpb=51c7741040d95c5deece939dae5e4136cc04afc4

diff --git a/altosui/AltosAscent.java b/altosui/AltosAscent.java
index 64bdcf30..d607b0c5 100644
--- a/altosui/AltosAscent.java
+++ b/altosui/AltosAscent.java
@@ -36,6 +36,18 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 		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("");
@@ -87,6 +99,16 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 		void reset() {
 			value.setText("");
 		}
+
+		void show() {
+			label.setVisible(true);
+			value.setVisible(true);
+		}
+
+		void hide() {
+			label.setVisible(false);
+			value.setVisible(false);
+		}
 		public AscentValue (GridBagLayout layout, int y, String text) {
 			GridBagConstraints	c = new GridBagConstraints();
 			c.weighty = 1;
@@ -126,14 +148,19 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 		void reset() {
 			value.setText("");
 			max_value.setText("");
-			max = 0;
+			max = AltosRecord.MISSING;
 		}
 
 		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) {
@@ -223,6 +250,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);
 		}
@@ -235,6 +263,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);
 		}
@@ -247,6 +276,7 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 
 	class Lat extends AscentValue {
 		void show (AltosState state, int crc_errors) {
+			show();
 			if (state.gps != null)
 				value.setText(pos(state.gps.lat,"N", "S"));
 			else
@@ -261,6 +291,7 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 
 	class Lon extends AscentValue {
 		void show (AltosState state, int crc_errors) {
+			show();
 			if (state.gps != null)
 				value.setText(pos(state.gps.lon,"E", "W"));
 			else
@@ -284,11 +315,22 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 	}
 
 	public void show(AltosState state, int crc_errors) {
-		lat.show(state, crc_errors);
-		lon.show(state, crc_errors);
+		if (state.gps != null && state.gps.connected) {
+			lat.show(state, crc_errors);
+			lon.show(state, crc_errors);
+		} else {
+			lat.hide();
+			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);
 	}