X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosuilib%2FAltosInfoTable.java;h=226f112f9542dff7c328b91514704bb4931a9bb8;hb=765d4c96510c823b4e9410c55ba8466438846029;hp=09e497a5ec01a049ea5d54251bf24d14e840053e;hpb=b2deef36f135b52ba2eea3042e9d1a1198d4a9ae;p=fw%2Faltos

diff --git a/altosuilib/AltosInfoTable.java b/altosuilib/AltosInfoTable.java
index 09e497a5..226f112f 100644
--- a/altosuilib/AltosInfoTable.java
+++ b/altosuilib/AltosInfoTable.java
@@ -16,13 +16,13 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_13;
+package org.altusmetrum.altosuilib_14;
 
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.table.*;
-import org.altusmetrum.altoslib_13.*;
+import org.altusmetrum.altoslib_14.*;
 
 public class AltosInfoTable extends JTable implements AltosFlightDisplay, HierarchyListener {
 	private AltosFlightInfoTableModel model;
@@ -201,9 +201,9 @@ public class AltosInfoTable extends JTable implements AltosFlightDisplay, Hierar
 				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);
+					info_add_row(1, "GPS altitude", "%8.1f m", state.gps.alt);
 				if (state.gps_height != AltosLib.MISSING)
-					info_add_row(1, "GPS height", "%8.1f", state.gps_height);
+					info_add_row(1, "GPS height", "%8.1f m", state.gps_height);
 
 				if (state.gps.ground_speed != AltosLib.MISSING && state.gps.course != AltosLib.MISSING)
 					info_add_row(1, "GPS ground speed", "%6.1f m/s %3d°",
@@ -242,7 +242,7 @@ public class AltosInfoTable extends JTable implements AltosFlightDisplay, Hierar
 					}
 					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", "%6.0f m", state.pad_alt);
+					info_add_row(1, "Pad GPS alt", "%6.0f m", state.gps_ground_altitude());
 				}
 				if (state.gps.year != AltosLib.MISSING)
 					info_add_row(2, "GPS date", "%04d-%02d-%02d",
@@ -280,9 +280,10 @@ public class AltosInfoTable extends JTable implements AltosFlightDisplay, Hierar
 			info_add_row(3, "Gyro yaw", "%8.1f °/s", state.gyro_yaw());
 			if (state.mag_along() != AltosLib.MISSING) {
 				/* Report mag in nanoteslas (1 G = 100000 nT (or γ)) */
-				info_add_row(3, "Mag along", "%8.1f γ", state.mag_along() * 100000.0);
-				info_add_row(3, "Mag across", "%8.1f γ", state.mag_across() * 100000.0);
-				info_add_row(3, "Mag Through", "%8.1f γ", state.mag_through() * 100000.0);
+				info_add_row(3, "Mag along", "%8.1f µT", state.mag_along() * 100.0);
+				info_add_row(3, "Mag across", "%8.1f µT", state.mag_across() * 100.0);
+				info_add_row(3, "Mag Through", "%8.1f µT", state.mag_through() * 100.0);
+				info_add_row(3, "Mag Bearing", "%8.1f°", Math.atan2(state.mag_across(), state.mag_through()) * 180/Math.PI);
 			}
 		}