X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosFlightStatusTableModel.java;h=c2cf8cd1911a09d4723f7a872a5c0905e81e3e5d;hp=75bf16eb19c8991bf3c79c9b3a88df8c1e5147c3;hb=67da878f740a387d0092631ad672e024d26e4192;hpb=66a1e07efcac9324d33a1eca0dfb58a2724b667a

diff --git a/altosui/AltosFlightStatusTableModel.java b/altosui/AltosFlightStatusTableModel.java
index 75bf16eb..c2cf8cd1 100644
--- a/altosui/AltosFlightStatusTableModel.java
+++ b/altosui/AltosFlightStatusTableModel.java
@@ -30,7 +30,12 @@ import java.util.concurrent.LinkedBlockingQueue;
 import org.altusmetrum.AltosLib.*;
 
 public class AltosFlightStatusTableModel extends AbstractTableModel {
-	private String[] columnNames = {"Height (m)", "State", "RSSI (dBm)", "Speed (m/s)" };
+	private String[] columnNames = {
+		String.format("Height (%s)", AltosConvert.show_distance_units()),
+		"State",
+		"RSSI (dBm)",
+		String.format("Speed (%s)", AltosConvert.show_speed_unit())
+	};
 	private Object[] data = { 0, "idle", 0, 0 };
 
 	public int getColumnCount() { return columnNames.length; }
@@ -51,12 +56,12 @@ public class AltosFlightStatusTableModel extends AbstractTableModel {
 	}
 
 	public void set(AltosState state) {
-		setValueAt(String.format("%1.0f", state.height), 0);
+		setValueAt(String.format("%1.0f", AltosConvert.distance(state.height), 0);
 		setValueAt(state.data.state(), 1);
 		setValueAt(state.data.rssi, 2);
 		double speed = state.baro_speed;
 		if (state.ascent)
 			speed = state.speed;
-		setValueAt(String.format("%1.0f", speed), 3);
+		setValueAt(String.format("%1.0f", AltosConvert.speed(speed)), 3);
 	}
 }