X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosUI.java;h=58f39de5efcd22868d8c69b7fbc617d4a6c725ab;hp=824e4b5b6af456c64c3bd98cde09d0d4a8a88d98;hb=9e8f7f75442303f9bfa99a0435984f5d36863ae6;hpb=e286eb61ad2a90746c1c31f95d26d5edb48738d3

diff --git a/ao-tools/altosui/AltosUI.java b/ao-tools/altosui/AltosUI.java
index 824e4b5b..58f39de5 100644
--- a/ao-tools/altosui/AltosUI.java
+++ b/ao-tools/altosui/AltosUI.java
@@ -37,92 +37,11 @@ import altosui.AltosDeviceDialog;
 import altosui.AltosPreferences;
 import altosui.AltosLog;
 import altosui.AltosVoice;
+import altosui.AltosFlightStatusTableModel;
+import altosui.AltosFlightInfoTableModel;
 
 import libaltosJNI.*;
 
-class AltosFlightStatusTableModel extends AbstractTableModel {
-	private String[] columnNames = {"Height (m)", "State", "RSSI (dBm)", "Speed (m/s)" };
-	private Object[] data = { 0, "idle", 0, 0 };
-
-	public int getColumnCount() { return columnNames.length; }
-	public int getRowCount() { return 2; }
-	public Object getValueAt(int row, int col) {
-		if (row == 0)
-			return columnNames[col];
-		return data[col];
-	}
-
-	public void setValueAt(Object value, int col) {
-		data[col] = value;
-		fireTableCellUpdated(1, col);
-	}
-
-	public void setValueAt(Object value, int row, int col) {
-		setValueAt(value, col);
-	}
-
-	public void set(AltosState state) {
-		setValueAt(String.format("%1.0f", 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);
-	}
-}
-
-class AltosFlightInfoTableModel extends AbstractTableModel {
-	private String[] columnNames = {"Field", "Value"};
-
-	class InfoLine {
-		String	name;
-		String	value;
-
-		public InfoLine(String n, String v) {
-			name = n;
-			value = v;
-		}
-	}
-
-	private ArrayList<InfoLine> rows = new ArrayList<InfoLine>();
-
-	public int getColumnCount() { return columnNames.length; }
-	public String getColumnName(int col) { return columnNames[col]; }
-
-	public int getRowCount() { return 20; }
-
-	public Object getValueAt(int row, int col) {
-		if (row >= rows.size())
-			return "";
-		if (col == 0)
-			return rows.get(row).name;
-		else
-			return rows.get(row).value;
-	}
-
-	int	current_row = 0;
-	int	prev_num_rows = 0;
-
-	public void resetRow() {
-		current_row = 0;
-	}
-	public void addRow(String name, String value) {
-		if (current_row >= rows.size())
-			rows.add(current_row, new InfoLine(name, value));
-		else
-			rows.set(current_row, new InfoLine(name, value));
-		current_row++;
-	}
-	public void finish() {
-		if (current_row > prev_num_rows) {
-			fireTableRowsInserted(prev_num_rows, current_row - 1);
-			prev_num_rows = current_row;
-		}
-		fireTableDataChanged();
-	}
-}
-
 public class AltosUI extends JFrame {
 	private int channel = -1;
 
@@ -310,13 +229,13 @@ public class AltosUI extends JFrame {
 				info_add_row(1, "Pad GPS alt", "%6.0f m", state.pad_alt);
 			}
 			info_add_row(1, "GPS date", "%04d-%02d-%02d",
-				       state.gps.gps_time.year,
-				       state.gps.gps_time.month,
-				       state.gps.gps_time.day);
+				       state.gps.year,
+				       state.gps.month,
+				       state.gps.day);
 			info_add_row(1, "GPS time", "  %02d:%02d:%02d",
-				       state.gps.gps_time.hour,
-				       state.gps.gps_time.minute,
-				       state.gps.gps_time.second);
+				       state.gps.hour,
+				       state.gps.minute,
+				       state.gps.second);
 			int	nsat_vis = 0;
 			int	c;