X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosDescent.java;h=2a9e7eef3bf728d834d62b87021da6fd9d71b653;hp=594a7a09bb68cc71e9fd025b93134439fb434e94;hb=7f74761051f2a5ab45b82c4dd79a8569376bbe2e;hpb=f3e68341f6f5daaf26dd162e4f9a06c29988986a

diff --git a/altosui/AltosDescent.java b/altosui/AltosDescent.java
index 594a7a09..2a9e7eef 100644
--- a/altosui/AltosDescent.java
+++ b/altosui/AltosDescent.java
@@ -39,15 +39,15 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 		abstract void show(AltosState state, int crc_errors);
 
 		void show() {
-			label.show();
-			value.show();
-			lights.show();
+			label.setVisible(true);
+			value.setVisible(true);
+			lights.setVisible(true);
 		}
 
 		void hide() {
-			label.hide();
-			value.hide();
-			lights.hide();
+			label.setVisible(false);
+			value.setVisible(false);
+			lights.setVisible(false);
 		}
 
 		void reset() {
@@ -104,13 +104,13 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 		abstract void show(AltosState state, int crc_errors);
 
 		void show() {
-			label.show();
-			value.show();
+			label.setVisible(true);
+			value.setVisible(true);
 		}
 
 		void hide() {
-			label.hide();
-			value.hide();
+			label.setVisible(false);
+			value.setVisible(false);
 		}
 
 		void show(String format, double v) {
@@ -158,15 +158,15 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 		}
 
 		void show() {
-			label.show();
-			value1.show();
-			value2.show();
+			label.setVisible(true);
+			value1.setVisible(true);
+			value2.setVisible(true);
 		}
 
 		void hide() {
-			label.hide();
-			value1.hide();
-			value2.hide();
+			label.setVisible(false);
+			value1.setVisible(false);
+			value2.setVisible(false);
 		}
 
 		abstract void show(AltosState state, int crc_errors);
@@ -258,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("???");
@@ -272,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("???");
@@ -286,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);
 		}
@@ -363,7 +364,7 @@ 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);
-		if (state.gps != null) {
+		if (state.gps != null && state.gps.connected) {
 			bearing.show(state, crc_errors);
 			range.show(state, crc_errors);
 			elevation.show(state, crc_errors);
@@ -376,8 +377,14 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 			lat.hide();
 			lon.hide();
 		}
-		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();
 	}
 
 	public AltosDescent() {