X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosInfoTable.java;h=125fa94c57cd3f7fb35b2ea590fe9f6d66f41def;hp=3d16faf2cbf369f368563f8ce64dbd006015ccb5;hb=13f84be8d1568a3fc2ed5eef5dcc2093c149285e;hpb=398c02b945a58634c8932f07df2c2be8438da7d1

diff --git a/altosui/AltosInfoTable.java b/altosui/AltosInfoTable.java
index 3d16faf2..125fa94c 100644
--- a/altosui/AltosInfoTable.java
+++ b/altosui/AltosInfoTable.java
@@ -20,7 +20,7 @@ package altosui;
 import java.awt.*;
 import javax.swing.*;
 import javax.swing.table.*;
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_4.*;
 
 public class AltosInfoTable extends JTable {
 	private AltosFlightInfoTableModel model;
@@ -46,9 +46,9 @@ public class AltosInfoTable extends JTable {
 			TableColumn column = getColumnModel().getColumn(i);
 
 			if ((i & 1) == 0)
-				column.setPreferredWidth(text_width(" Satellites Visible "));
+				column.setPreferredWidth(text_width(" Satellites Visible"));
 			else
-				column.setPreferredWidth(text_width(" 179°59.99999' "));
+				column.setPreferredWidth(text_width("W 179°59.99999' "));
 		}
 	}
 
@@ -107,35 +107,41 @@ public class AltosInfoTable extends JTable {
 	public void show(AltosState state, AltosListenerState listener_state) {
 		info_reset();
 		if (state != null) {
-			if (state.altitude != AltosRecord.MISSING)
-				info_add_row(0, "Altitude", "%6.0f    m", state.altitude);
-			if (state.ground_altitude != AltosRecord.MISSING)
-				info_add_row(0, "Pad altitude", "%6.0f    m", state.ground_altitude);
-			if (state.height != AltosRecord.MISSING)
-				info_add_row(0, "Height", "%6.0f    m", state.height);
-			if (state.height != AltosRecord.MISSING)
-				info_add_row(0, "Max height", "%6.0f    m", state.max_height);
-			if (state.acceleration != AltosRecord.MISSING)
-				info_add_row(0, "Acceleration", "%8.1f  m/s²", state.acceleration);
-			if (state.acceleration != AltosRecord.MISSING)
-				info_add_row(0, "Max acceleration", "%8.1f  m/s²", state.max_acceleration);
-			if (state.speed() != AltosRecord.MISSING)
+			if (state.device_type != AltosLib.MISSING)
+				info_add_row(0, "Device", "%s", AltosLib.product_name(state.device_type));
+			if (state.altitude() != AltosLib.MISSING)
+				info_add_row(0, "Altitude", "%6.0f    m", state.altitude());
+			if (state.ground_altitude() != AltosLib.MISSING)
+				info_add_row(0, "Pad altitude", "%6.0f    m", state.ground_altitude());
+			if (state.height() != AltosLib.MISSING)
+				info_add_row(0, "Height", "%6.0f    m", state.height());
+			if (state.max_height() != AltosLib.MISSING)
+				info_add_row(0, "Max height", "%6.0f    m", state.max_height());
+			if (state.acceleration() != AltosLib.MISSING)
+				info_add_row(0, "Acceleration", "%8.1f  m/s²", state.acceleration());
+			if (state.max_acceleration() != AltosLib.MISSING)
+				info_add_row(0, "Max acceleration", "%8.1f  m/s²", state.max_acceleration());
+			if (state.speed() != AltosLib.MISSING)
 				info_add_row(0, "Speed", "%8.1f  m/s", state.speed());
-			if (state.speed() != AltosRecord.MISSING)
-				info_add_row(0, "Max Speed", "%8.1f  m/s", state.max_accel_speed);
-			if (state.temperature != AltosRecord.MISSING)
+			if (state.max_speed() != AltosLib.MISSING)
+				info_add_row(0, "Max Speed", "%8.1f  m/s", state.max_speed());
+			if (state.orient() != AltosLib.MISSING)
+				info_add_row(0, "Tilt", "%4.0f °", state.orient());
+			if (state.max_orient() != AltosLib.MISSING)
+				info_add_row(0, "Max Tilt", "%4.0f °", state.max_orient());
+			if (state.temperature != AltosLib.MISSING)
 				info_add_row(0, "Temperature", "%9.2f °C", state.temperature);
-			if (state.battery != AltosRecord.MISSING)
-				info_add_row(0, "Battery", "%9.2f V", state.battery);
-			if (state.drogue_sense != AltosRecord.MISSING)
-				info_add_row(0, "Drogue", "%9.2f V", state.drogue_sense);
-			if (state.main_sense != AltosRecord.MISSING)
-				info_add_row(0, "Main", "%9.2f V", state.main_sense);
+			if (state.battery_voltage != AltosLib.MISSING)
+				info_add_row(0, "Battery", "%9.2f V", state.battery_voltage);
+			if (state.apogee_voltage != AltosLib.MISSING)
+				info_add_row(0, "Drogue", "%9.2f V", state.apogee_voltage);
+			if (state.main_voltage != AltosLib.MISSING)
+				info_add_row(0, "Main", "%9.2f V", state.main_voltage);
 		}
 		if (listener_state != null) {
 			info_add_row(0, "CRC Errors", "%6d", listener_state.crc_errors);
 
-			if (listener_state.battery != AltosRecord.MISSING)
+			if (listener_state.battery != AltosLib.MISSING)
 				info_add_row(0, "Receiver Battery", "%9.2f", listener_state.battery);
 		}
 
@@ -148,17 +154,21 @@ public class AltosInfoTable extends JTable {
 				else
 					info_add_row(1, "GPS state", "wait (%d)",
 						     state.gps_waiting);
-				if (state.data.gps.locked)
+				if (state.gps.locked)
 					info_add_row(1, "GPS", "   locked");
-				else if (state.data.gps.connected)
+				else if (state.gps.connected)
 					info_add_row(1, "GPS", " unlocked");
 				else
 					info_add_row(1, "GPS", "  missing");
-				info_add_row(1, "Satellites", "%6d", state.data.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", "%6d", state.gps.alt);
-				info_add_row(1, "GPS height", "%6.0f", state.gps_height);
+				info_add_row(1, "Satellites", "%6d", state.gps.nsat);
+				if (state.gps.lat != AltosLib.MISSING)
+					info_add_deg(1, "Latitude", state.gps.lat, 'N', 'S');
+				if (state.gps.lon != AltosLib.MISSING)
+					info_add_deg(1, "Longitude", state.gps.lon, 'E', 'W');
+				if (state.gps.alt != AltosLib.MISSING)
+					info_add_row(1, "GPS altitude", "%8.1f", state.gps.alt);
+				if (state.gps_height != AltosLib.MISSING)
+					info_add_row(1, "GPS height", "%8.1f", state.gps_height);
 
 				/* The SkyTraq GPS doesn't report these values */
 				/*
@@ -195,14 +205,16 @@ public class AltosInfoTable extends JTable {
 					info_add_deg(1, "Pad longitude", state.pad_lon, 'E', 'W');
 					info_add_row(1, "Pad GPS alt", "%6.0f m", state.pad_alt);
 				}
-				info_add_row(1, "GPS date", "%04d-%02d-%02d",
-					     state.gps.year,
-					     state.gps.month,
-					     state.gps.day);
-				info_add_row(1, "GPS time", "  %02d:%02d:%02d",
-					     state.gps.hour,
-					     state.gps.minute,
-					     state.gps.second);
+				if (state.gps.year != AltosLib.MISSING)
+					info_add_row(1, "GPS date", "%04d-%02d-%02d",
+						     state.gps.year,
+						     state.gps.month,
+						     state.gps.day);
+				if (state.gps.hour != AltosLib.MISSING)
+					info_add_row(1, "GPS time", "  %02d:%02d:%02d",
+						     state.gps.hour,
+						     state.gps.minute,
+						     state.gps.second);
 				//int	nsat_vis = 0;
 				int	c;