X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosInfoTable.java;h=579d720b0493b042dada3c48e9d18cf89feecae8;hp=c14009767447debd51491dfe1f6a1d449b4253ef;hb=5a3c5de6657d1c26e52015a8acec0cd05e294cef;hpb=583458772746317b98fced907ec780edff465888

diff --git a/altosui/AltosInfoTable.java b/altosui/AltosInfoTable.java
index c1400976..579d720b 100644
--- a/altosui/AltosInfoTable.java
+++ b/altosui/AltosInfoTable.java
@@ -18,16 +18,9 @@
 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.*;
 
 public class AltosInfoTable extends JTable {
 	private AltosFlightInfoTableModel model;
@@ -92,9 +85,9 @@ public class AltosInfoTable extends JTable {
 	}
 
 	void info_add_deg(int col, String name, double v, int pos, int neg) {
-		int	c = pos;
+		//int	c = pos;
 		if (v < 0) {
-			c = neg;
+			//c = neg;
 			v = -v;
 		}
 		double	deg = Math.floor(v);
@@ -121,8 +114,8 @@ public class AltosInfoTable extends JTable {
 		info_add_row(0, "Max height", "%6.0f    m", state.max_height);
 		info_add_row(0, "Acceleration", "%8.1f  m/s²", state.acceleration);
 		info_add_row(0, "Max acceleration", "%8.1f  m/s²", state.max_acceleration);
-		info_add_row(0, "Speed", "%8.1f  m/s", state.ascent ? state.speed : state.baro_speed);
-		info_add_row(0, "Max Speed", "%8.1f  m/s", state.max_speed);
+		info_add_row(0, "Speed", "%8.1f  m/s", state.speed());
+		info_add_row(0, "Max Speed", "%8.1f  m/s", state.max_accel_speed);
 		info_add_row(0, "Temperature", "%9.2f °C", state.temperature);
 		info_add_row(0, "Battery", "%9.2f V", state.battery);
 		if (state.drogue_sense != AltosRecord.MISSING)
@@ -152,6 +145,7 @@ public class AltosInfoTable extends JTable {
 			info_add_row(1, "GPS height", "%6.0f", state.gps_height);
 
 			/* The SkyTraq GPS doesn't report these values */
+			/*
 			if (false) {
 				info_add_row(1, "GPS ground speed", "%8.1f m/s %3d°",
 					     state.gps.ground_speed,
@@ -161,6 +155,8 @@ public class AltosInfoTable extends JTable {
 				info_add_row(1, "GPS error", "%6d m(h)%3d m(v)",
 					     state.gps.h_error, state.gps.v_error);
 			}
+			*/
+
 			info_add_row(1, "GPS hdop", "%8.1f", state.gps.hdop);
 
 			if (state.npad > 0) {
@@ -191,7 +187,7 @@ public class AltosInfoTable extends JTable {
 				       state.gps.hour,
 				       state.gps.minute,
 				       state.gps.second);
-			int	nsat_vis = 0;
+			//int	nsat_vis = 0;
 			int	c;
 
 			if (state.gps.cc_gps_sat == null)