X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosInfoTable.java;h=2facf38ae21f76f95a6a9005804840f846eae321;hb=90ee11542b111befa0e96e27292dc548e5c37396;hp=86e02ab1ddcbe07733f6063fefc44086f6d4fdc1;hpb=52d3cad4f744140e1aa06fdfc0d49a0cf8734fd4;p=fw%2Faltos

diff --git a/altosui/AltosInfoTable.java b/altosui/AltosInfoTable.java
index 86e02ab1..2facf38a 100644
--- a/altosui/AltosInfoTable.java
+++ b/altosui/AltosInfoTable.java
@@ -20,7 +20,7 @@ package altosui;
 import java.awt.*;
 import javax.swing.*;
 import javax.swing.table.*;
-import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altoslib_1.*;
 
 public class AltosInfoTable extends JTable {
 	private AltosFlightInfoTableModel model;
@@ -85,15 +85,15 @@ 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);
 		double	min = (v - deg) * 60;
 
-		info_add_row(col, name, String.format("%3.0f°%08.5f'", deg, min));
+		info_add_row(col, name, String.format("%c %3.0f°%08.5f'", c, deg, min));
 	}
 
 	void info_finish() {
@@ -114,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)