*
* 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
* 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.*;
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; }
}
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