altosui: Add orient to ascent and info table views

[fw/altos] / altosui / AltosInfoTable.java

diff --git a/altosui/AltosInfoTable.java b/altosui/AltosInfoTable.java
index b181dbd9f73e9424ffab21736b95f529714c5102..7ba62d01d38573461d859d55bd6298a93a197c66 100644 (file)
--- 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_2.*;
+import org.altusmetrum.altoslib_3.*;
 
 public class AltosInfoTable extends JTable {
        private AltosFlightInfoTableModel model;
@@ -107,6 +107,8 @@ public class AltosInfoTable extends JTable {
        public void show(AltosState state, AltosListenerState listener_state) {
                info_reset();
                if (state != null) {
+                       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)
@@ -123,6 +125,10 @@ public class AltosInfoTable extends JTable {
                                info_add_row(0, "Speed", "%8.1f  m/s", state.speed());
                        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_voltage != AltosLib.MISSING)