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

diff --git a/altosui/AltosPad.java b/altosui/AltosPad.java
index 2f59e879..d08925be 100644
--- a/altosui/AltosPad.java
+++ b/altosui/AltosPad.java
@@ -43,15 +43,15 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 		}
 
 		public void show() {
-			label.show();
-			value.show();
-			lights.show();
+			label.setVisible(true);
+			value.setVisible(true);
+			lights.setVisible(true);
 		}
 
 		public void hide() {
-			label.hide();
-			value.hide();
-			lights.hide();
+			label.setVisible(false);
+			value.setVisible(false);
+			lights.setVisible(false);
 		}
 
 		public LaunchStatus (GridBagLayout layout, int y, String text) {
@@ -96,13 +96,13 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 		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 reset() {
@@ -149,6 +149,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
 	class Apogee extends LaunchStatus {
 		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);
 		}
@@ -161,6 +162,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
 	class Main extends LaunchStatus {
 		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);
 		}
@@ -259,10 +261,16 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
 	public void show(AltosState state, int crc_errors) {
 		battery.show(state, crc_errors);
-		apogee.show(state, crc_errors);
-		main.show(state, crc_errors);
+		if (state.drogue_sense == AltosRecord.MISSING)
+			apogee.hide();
+		else
+			apogee.show(state, crc_errors);
+		if (state.main_sense == AltosRecord.MISSING)
+			main.hide();
+		else
+			main.show(state, crc_errors);
 		pad_alt.show(state, crc_errors);
-		if (state.gps != null) {
+		if (state.gps != null && state.gps.connected) {
 			gps_locked.show(state, crc_errors);
 			gps_ready.show(state, crc_errors);
 			pad_lat.show(state, crc_errors);