X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosFlightStatusTableModel.java;h=c2cf8cd1911a09d4723f7a872a5c0905e81e3e5d;hb=f9e1c5949a24e27897587b0b0ca00e089f362215;hp=4c24b6ace99a794b5ce487cdd4201b048042124c;hpb=51c7741040d95c5deece939dae5e4136cc04afc4;p=fw%2Faltos

diff --git a/altosui/AltosFlightStatusTableModel.java b/altosui/AltosFlightStatusTableModel.java
index 4c24b6ac..c2cf8cd1 100644
--- a/altosui/AltosFlightStatusTableModel.java
+++ b/altosui/AltosFlightStatusTableModel.java
@@ -27,9 +27,15 @@ import java.util.*;
 import java.text.*;
 import java.util.prefs.*;
 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; }
@@ -50,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);
 	}
 }