X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosuilib%2FAltosInfoTable.java;h=e759394bb4645e0f304bad9017641630248d5849;hp=89a656c9004d1af67d59abb6c7973365a2136600;hb=cc83d57454ed07e4828b4413e5af6ae2ecfe2e5a;hpb=4231d68bae69d9a7d1f52205002db452cd5f986d

diff --git a/altosuilib/AltosInfoTable.java b/altosuilib/AltosInfoTable.java
index 89a656c9..e759394b 100644
--- a/altosuilib/AltosInfoTable.java
+++ b/altosuilib/AltosInfoTable.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,13 +16,13 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_6;
+package org.altusmetrum.altosuilib_12;
 
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.table.*;
-import org.altusmetrum.altoslib_6.*;
+import org.altusmetrum.altoslib_12.*;
 
 public class AltosInfoTable extends JTable implements AltosFlightDisplay, HierarchyListener {
 	private AltosFlightInfoTableModel model;
@@ -127,6 +128,8 @@ public class AltosInfoTable extends JTable implements AltosFlightDisplay, Hierar
 
 	public void show(AltosState state, AltosListenerState listener_state) {
 
+		AltosCalData	cal_data = state.cal_data();
+
 		if (!isShowing()) {
 			last_state = state;
 			last_listener_state = listener_state;
@@ -135,12 +138,16 @@ public class AltosInfoTable extends JTable implements AltosFlightDisplay, Hierar
 
 		reset();
 		if (state != null) {
-			if (state.device_type != AltosLib.MISSING)
-				info_add_row(0, "Device", "%s", AltosLib.product_name(state.device_type));
+			if (cal_data.device_type != AltosLib.MISSING)
+				info_add_row(0, "Device", "%s", AltosLib.product_name(cal_data.device_type));
+			else if (cal_data.product != null)
+				info_add_row(0, "Device", "%s", cal_data.product);
+			if (state.tick() != AltosLib.MISSING)
+				info_add_row(0, "Tick", "%6d", state.tick());
 			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 (cal_data.ground_altitude != AltosLib.MISSING)
+				info_add_row(0, "Pad altitude", "%6.0f    m", cal_data.ground_altitude);
 			if (state.height() != AltosLib.MISSING)
 				info_add_row(0, "Height", "%6.0f    m", state.height());
 			if (state.max_height() != AltosLib.MISSING)