X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosUI.java;h=599c5aecb9f1b3975cd90b94cd36547207577f1f;hp=7befe778cca7102318c9f04546937388a07b4a0a;hb=3f9b66b307ee88172151e3bee58e50f5acbde109;hpb=caa0bf49668344937483190d1c258bfa32971d19

diff --git a/ao-tools/altosui/AltosUI.java b/ao-tools/altosui/AltosUI.java
index 7befe778..599c5aec 100644
--- a/ao-tools/altosui/AltosUI.java
+++ b/ao-tools/altosui/AltosUI.java
@@ -52,7 +52,7 @@ class AltosFlightStatusTableModel extends AbstractTableModel {
 
 	public void setValueAt(Object value, int col) {
 		data[col] = value;
-		fireTableCellUpdated(0, col);
+		fireTableCellUpdated(1, col);
 	}
 
 	public void setValueAt(Object value, int row, int col) {
@@ -214,7 +214,7 @@ public class AltosUI extends JFrame {
 		serialLine = new AltosSerial();
 		serialLine.monitor(new AltosUIMonitor());
 		int dpi = Toolkit.getDefaultToolkit().getScreenResolution();
-		this.setSize(new Dimension (infoValueMetrics.charWidth('0') * 6 * 15,
+		this.setSize(new Dimension (infoValueMetrics.charWidth('0') * 6 * 20,
 					    statusHeight * 4 + infoHeight * 17));
 		this.validate();
 		setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
@@ -273,7 +273,7 @@ public class AltosUI extends JFrame {
 		if (state.npad >= MIN_PAD_SAMPLES)
 			info_add_row(0, "Ground state", "%s", "ready");
 		else
-			info_add_row(0, "Ground state", "waiting for gps (%d)",
+			info_add_row(0, "Ground state", "wait (%d)",
 				     MIN_PAD_SAMPLES - state.npad);
 		info_add_row(0, "Rocket state", "%s", state.data.state);
 		info_add_row(0, "Callsign", "%s", state.data.callsign);
@@ -292,56 +292,58 @@ public class AltosUI extends JFrame {
 		info_add_row(0, "Drogue", "%9.2f V", state.drogue_sense);
 		info_add_row(0, "Main", "%9.2f V", state.main_sense);
 		info_add_row(0, "Pad altitude", "%6.0f    m", state.ground_altitude);
-		if (state.gps != null)
-			info_add_row(1, "Satellites", "%6d", state.gps.nsat);
-		else
-			info_add_row(1, "Satellites", "%6d", 0);
-		if (state.gps != null && state.gps.gps_locked) {
-			info_add_row(1, "GPS", "locked");
-		} else if (state.gps != null && state.gps.gps_connected) {
-			info_add_row(1, "GPS", "unlocked");
-		} else {
+		if (state.gps == null) {
 			info_add_row(1, "GPS", "not available");
-		}
-		if (state.gps != null) {
+		} else {
+			if (state.data.gps.gps_locked)
+				info_add_row(1, "GPS", "   locked");
+			else if (state.data.gps.gps_connected)
+				info_add_row(1, "GPS", " unlocked");
+			else
+				info_add_row(1, "GPS", "  missing");
+			info_add_row(1, "Satellites", "%6d", state.gps.nsat);
 			info_add_deg(1, "Latitude", state.gps.lat, 'N', 'S');
 			info_add_deg(1, "Longitude", state.gps.lon, 'E', 'W');
-			info_add_row(1, "GPS altitude", "%d", state.gps.alt);
-			info_add_row(1, "GPS height", "%d", state.gps_height);
+			info_add_row(1, "GPS altitude", "%6d", state.gps.alt);
+			info_add_row(1, "GPS height", "%6.0f", state.gps_height);
+			info_add_row(1, "GPS ground speed", "%8.1f m/s %3d°",
+				       state.gps.ground_speed,
+				       state.gps.course);
+			info_add_row(1, "GPS climb rate", "%8.1f m/s",
+				     state.gps.climb_rate);
+			info_add_row(1, "GPS hdop", "%8.1f", state.gps.hdop);
+			info_add_row(1, "GPS error", "%6d m(h)%3d m(v)",
+				     state.gps.h_error, state.gps.v_error);
+			if (state.npad > 0) {
+				if (state.from_pad != null) {
+					info_add_row(1, "Distance from pad", "%6.0f m", state.from_pad.distance);
+					info_add_row(1, "Direction from pad", "%6.0f°", state.from_pad.bearing);
+				} else {
+					info_add_row(1, "Distance from pad", "unknown");
+					info_add_row(1, "Direction from pad", "unknown");
+				}
+				info_add_deg(1, "Pad latitude", state.pad_lat, 'N', 'S');
+				info_add_deg(1, "Pad longitude", state.pad_lon, 'E', 'W');
+				info_add_row(1, "Pad GPS alt", "%9.2fm", 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);
-			info_add_row(1, "GPS time", "%02d:%02d:%02d",
+			info_add_row(1, "GPS time", "  %02d:%02d:%02d",
 				       state.gps.gps_time.hour,
 				       state.gps.gps_time.minute,
 				       state.gps.gps_time.second);
-			info_add_row(1, "GPS ground speed", "%7.1fm/s %d°",
-				       state.gps.ground_speed,
-				       state.gps.course);
-			info_add_row(1, "GPS climb rate", "%7.1fm/s",
-				     state.gps.climb_rate);
-			info_add_row(1, "GPS precision", "%4.1f(hdop) %3dm(h) %3dm(v)",
-				     state.gps.hdop, state.gps.h_error, state.gps.v_error);
-		}
-		if (state.npad > 0) {
-			info_add_row(1, "Distance from pad", "%5.0fm", state.from_pad.distance);
-			info_add_row(1, "Direction from pad", "%4.0f°", state.from_pad.bearing);
-			info_add_deg(1, "Pad latitude", state.pad_lat, 'N', 'S');
-			info_add_deg(1, "Pad longitude", state.pad_lon, 'E', 'W');
-			info_add_row(1, "Pad GPS alt", "%gm", state.pad_alt);
-		}
-		if (state.gps != null && state.gps.gps_connected) {
 			int	nsat_vis = 0;
 			int	c;
 
 			if (state.gps.cc_gps_sat == null)
-				info_add_row(2, "Satellites Visible", "%d", 0);
+				info_add_row(2, "Satellites Visible", "%4d", 0);
 			else {
-				info_add_row(2, "Satellites Visible", "%d", state.gps.cc_gps_sat.length);
+				info_add_row(2, "Satellites Visible", "%4d", state.gps.cc_gps_sat.length);
 				for (c = 0; c < state.gps.cc_gps_sat.length; c++) {
 					info_add_row(2, "Satellite id,C/N0",
-						     "%3d,%2d",
+						     "%4d, %4d",
 						     state.gps.cc_gps_sat[c].svid,
 						     state.gps.cc_gps_sat[c].c_n0);
 				}