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

diff --git a/altosui/AltosDescent.java b/altosui/AltosDescent.java
index 594a7a09..62258814 100644
--- a/altosui/AltosDescent.java
+++ b/altosui/AltosDescent.java
@@ -27,6 +27,7 @@ import java.util.*;
 import java.text.*;
 import java.util.prefs.*;
 import java.util.concurrent.LinkedBlockingQueue;
+import org.altusmetrum.AltosLib.*;
 
 public class AltosDescent extends JComponent implements AltosFlightDisplay {
 	GridBagLayout	layout;
@@ -39,15 +40,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() {
@@ -55,6 +56,11 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 			lights.set(false);
 		}
 
+		void set_font() {
+			label.setFont(Altos.label_font);
+			value.setFont(Altos.value_font);
+		}
+
 		public DescentStatus (GridBagLayout layout, int y, String text) {
 			GridBagConstraints	c = new GridBagConstraints();
 			c.weighty = 1;
@@ -104,13 +110,17 @@ 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(AltosUnits units, double v) {
+			value.setText(units.show(8, v));
 		}
 
 		void show(String format, double v) {
@@ -121,6 +131,11 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 			value.setText(v);
 		}
 
+		void set_font() {
+			label.setFont(Altos.label_font);
+			value.setFont(Altos.value_font);
+		}
+
 		public DescentValue (GridBagLayout layout, int x, int y, String text) {
 			GridBagConstraints	c = new GridBagConstraints();
 			c.weighty = 1;
@@ -158,15 +173,21 @@ 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);
+		}
+
+		void set_font() {
+			label.setFont(Altos.label_font);
+			value1.setFont(Altos.value_font);
+			value2.setFont(Altos.value_font);
 		}
 
 		abstract void show(AltosState state, int crc_errors);
@@ -222,7 +243,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 
 	class Height extends DescentValue {
 		void show (AltosState state, int crc_errors) {
-			show("%6.0f m", state.height);
+			show(AltosConvert.height, state.height);
 		}
 		public Height (GridBagLayout layout, int x, int y) {
 			super (layout, x, y, "Height");
@@ -236,7 +257,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 			double speed = state.speed;
 			if (!state.ascent)
 				speed = state.baro_speed;
-			show("%6.0f m/s", speed);
+			show(AltosConvert.speed, speed);
 		}
 		public Speed (GridBagLayout layout, int x, int y) {
 			super (layout, x, y, "Speed");
@@ -258,7 +279,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 +293,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 +307,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);
 		}
@@ -328,7 +350,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 
 	class Range extends DescentValue {
 		void show (AltosState state, int crc_errors) {
-			show("%6.0f m", state.range);
+			show(AltosConvert.distance, state.range);
 		}
 		public Range (GridBagLayout layout, int x, int y) {
 			super (layout, x, y, "Range");
@@ -360,10 +382,22 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 		apogee.reset();
 	}
 
+	public void set_font() {
+		lat.set_font();
+		lon.set_font();
+		height.set_font();
+		speed.set_font();
+		bearing.set_font();
+		range.set_font();
+		elevation.set_font();
+		main.set_font();
+		apogee.set_font();
+	}
+
 	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 +410,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() {