X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosFlightStatusTableModel.java;h=7b872df9a599d93115ac851ba0218a0caafcb201;hp=75bf16eb19c8991bf3c79c9b3a88df8c1e5147c3;hb=639d8b3c4353ee25a0536e01653f3a86feb90ad5;hpb=3c2f601139d36761de6a8a2210545d082ef16133

diff --git a/altosui/AltosFlightStatusTableModel.java b/altosui/AltosFlightStatusTableModel.java
index 75bf16eb..7b872df9 100644
--- a/altosui/AltosFlightStatusTableModel.java
+++ b/altosui/AltosFlightStatusTableModel.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +15,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
-
+/*
 package altosui;
 
 import java.awt.*;
@@ -27,10 +28,15 @@ import java.util.*;
 import java.text.*;
 import java.util.prefs.*;
 import java.util.concurrent.LinkedBlockingQueue;
-import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altoslib_11.*;
 
 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 +57,13 @@ 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);
 	}
 }
+*/
\ No newline at end of file