X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosDescent.java;h=2a9e7eef3bf728d834d62b87021da6fd9d71b653;hp=16ccd458d2524b8d82ce22a4ed0e6f20a116b81d;hb=955989147f90a4fd22c1375d1b41425dae4e7dd1;hpb=f01096c4b42f9a4720ed0414826c2a283a992545

diff --git a/altosui/AltosDescent.java b/altosui/AltosDescent.java
index 16ccd458..2a9e7eef 100644
--- a/altosui/AltosDescent.java
+++ b/altosui/AltosDescent.java
@@ -37,6 +37,19 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 		AltosLights	lights;
 
 		abstract void show(AltosState state, int crc_errors);
+
+		void show() {
+			label.setVisible(true);
+			value.setVisible(true);
+			lights.setVisible(true);
+		}
+
+		void hide() {
+			label.setVisible(false);
+			value.setVisible(false);
+			lights.setVisible(false);
+		}
+
 		void reset() {
 			value.setText("");
 			lights.set(false);
@@ -90,6 +103,16 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 
 		abstract void show(AltosState state, int crc_errors);
 
+		void show() {
+			label.setVisible(true);
+			value.setVisible(true);
+		}
+
+		void hide() {
+			label.setVisible(false);
+			value.setVisible(false);
+		}
+
 		void show(String format, double v) {
 			value.setText(String.format(format, v));
 		}
@@ -134,12 +157,27 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 			value2.setText("");
 		}
 
+		void show() {
+			label.setVisible(true);
+			value1.setVisible(true);
+			value2.setVisible(true);
+		}
+
+		void hide() {
+			label.setVisible(false);
+			value1.setVisible(false);
+			value2.setVisible(false);
+		}
+
 		abstract void show(AltosState state, int crc_errors);
+
 		void show(String v1, String v2) {
+			show();
 			value1.setText(v1);
 			value2.setText(v2);
 		}
 		void show(String f1, double v1, String f2, double v2) {
+			show();
 			value1.setText(String.format(f1, v1));
 			value2.setText(String.format(f2, v2));
 		}
@@ -220,7 +258,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 
 	class Lat extends DescentValue {
 		void show (AltosState state, int crc_errors) {
-			if (state.gps != null)
+			if (state.gps != null && state.gps.connected)
 				show(pos(state.gps.lat,"N", "S"));
 			else
 				show("???");
@@ -234,7 +272,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 
 	class Lon extends DescentValue {
 		void show (AltosState state, int crc_errors) {
-			if (state.gps != null)
+			if (state.gps != null && state.gps.connected)
 				show(pos(state.gps.lon,"W", "E"));
 			else
 				show("???");
@@ -248,6 +286,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 
 	class Apogee extends DescentStatus {
 		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);
 		}
@@ -260,6 +299,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 
 	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);
 		}
@@ -324,13 +364,27 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 	public void show(AltosState state, int crc_errors) {
 		height.show(state, crc_errors);
 		speed.show(state, crc_errors);
-		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);
-		main.show(state, crc_errors);
-		apogee.show(state, crc_errors);
+		if (state.gps != null && state.gps.connected) {
+			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);
+		} else {
+			bearing.hide();
+			range.hide();
+			elevation.hide();
+			lat.hide();
+			lon.hide();
+		}
+		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();
 	}
 
 	public AltosDescent() {