X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosDescent.java;h=a71cdc10c0fc97f2305951365294cc165f1d3580;hp=61709afe0e769aaae0333819b1b2c21d6f4c1413;hb=ef9cb19d8b210e02eaa1c657833c1bd5fc619ad8;hpb=382c54a0d052c8975b57c995ef83bc8934bde242

diff --git a/altosui/AltosDescent.java b/altosui/AltosDescent.java
index 61709afe..a71cdc10 100644
--- a/altosui/AltosDescent.java
+++ b/altosui/AltosDescent.java
@@ -37,6 +37,15 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 			lights.setVisible(true);
 		}
 
+		void show(String s) {
+			show();
+			value.setText(s);
+		}
+
+		void show(String format, double value) {
+			show(String.format(format, value));
+		}
+
 		void hide() {
 			label.setVisible(false);
 			value.setVisible(false);
@@ -111,16 +120,17 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 			value.setVisible(false);
 		}
 
-		void show(AltosUnits units, double v) {
-			value.setText(units.show(8, v));
+		void show(String v) {
+			show();
+			value.setText(v);
 		}
 
-		void show(String format, double v) {
-			value.setText(String.format(format, v));
+		void show(AltosUnits units, double v) {
+			show(units.show(8, v));
 		}
 
-		void show(String v) {
-			value.setText(v);
+		void show(String format, double v) {
+			show(String.format(format, v));
 		}
 
 		void set_font() {
@@ -297,10 +307,25 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 
 	Lon lon;
 
+	class Distance extends DescentValue {
+		void show(AltosState state, int crc_errors) {
+			if (state.from_pad != null)
+				show(AltosConvert.distance, state.from_pad.distance);
+			else
+				show("???");
+		}
+
+		public Distance (GridBagLayout layout, int x, int y) {
+			super(layout, x, y, "Ground Distance");
+		}
+	}
+
+	Distance distance;
+		
+
 	class Apogee extends DescentStatus {
 		void show (AltosState state, int crc_errors) {
-			show();
-			value.setText(String.format("%4.2f V", state.drogue_sense));
+			show("%4.2f V", state.drogue_sense);
 			lights.set(state.drogue_sense > 3.2);
 		}
 		public Apogee (GridBagLayout layout, int y) {
@@ -312,8 +337,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));
+			show("%4.2f V", state.main_sense);
 			lights.set(state.main_sense > 3.2);
 		}
 		public Main (GridBagLayout layout, int y) {
@@ -369,6 +393,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 		speed.reset();
 		bearing.reset();
 		range.reset();
+		distance.reset();
 		elevation.reset();
 		main.reset();
 		apogee.reset();
@@ -381,6 +406,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 		speed.set_font();
 		bearing.set_font();
 		range.set_font();
+		distance.set_font();
 		elevation.set_font();
 		main.set_font();
 		apogee.set_font();
@@ -392,12 +418,14 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 		if (state.gps != null && state.gps.connected) {
 			bearing.show(state, crc_errors);
 			range.show(state, crc_errors);
+			distance.show(state, crc_errors);
 			elevation.show(state, crc_errors);
 			lat.show(state, crc_errors);
 			lon.show(state, crc_errors);
 		} else {
 			bearing.hide();
 			range.hide();
+			distance.hide();
 			elevation.hide();
 			lat.hide();
 			lon.hide();
@@ -423,10 +451,11 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 		elevation = new Elevation(layout, 0, 1);
 		range = new Range(layout, 2, 1);
 		bearing = new Bearing(layout, 0, 2);
-		lat = new Lat(layout, 0, 3);
-		lon = new Lon(layout, 2, 3);
+		distance = new Distance(layout, 0, 3);
+		lat = new Lat(layout, 0, 4);
+		lon = new Lon(layout, 2, 4);
 
-		apogee = new Apogee(layout, 4);
-		main = new Main(layout, 5);
+		apogee = new Apogee(layout, 5);
+		main = new Main(layout, 6);
 	}
 }