X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosDescent.java;h=821e3963f976ac7ae296ee80c9df8f16bf66a898;hb=ed200884f3e4fb895ee17ef38a9b6d3371b59625;hp=73972b865dfcb6a66eb493441bc966e7019abaf7;hpb=97ab77d548964115e4b41ad5952194fcd1455c96;p=fw%2Faltos

diff --git a/altosui/AltosDescent.java b/altosui/AltosDescent.java
index 73972b86..821e3963 100644
--- a/altosui/AltosDescent.java
+++ b/altosui/AltosDescent.java
@@ -18,16 +18,8 @@
 package altosui;
 
 import java.awt.*;
-import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
-import java.io.*;
-import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
-import java.util.concurrent.LinkedBlockingQueue;
-import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altoslib_1.*;
 
 public class AltosDescent extends JComponent implements AltosFlightDisplay {
 	GridBagLayout	layout;
@@ -264,7 +256,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 
 	class Speed extends DescentValue {
 		void show (AltosState state, int crc_errors) {
-			double speed = state.speed;
+			double speed = state.accel_speed;
 			if (!state.ascent)
 				speed = state.baro_speed;
 			show(AltosConvert.speed, speed);
@@ -315,6 +307,22 @@ 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("%4.2f V", state.drogue_sense);
@@ -385,6 +393,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 		speed.reset();
 		bearing.reset();
 		range.reset();
+		distance.reset();
 		elevation.reset();
 		main.reset();
 		apogee.reset();
@@ -397,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();
@@ -408,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();
@@ -439,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);
 	}
 }