altosui: Clear displayed data rows as needed.

[fw/altos] / ao-tools / altosui / AltosUI.java

diff --git a/ao-tools/altosui/AltosUI.java b/ao-tools/altosui/AltosUI.java
index 824e4b5b6af456c64c3bd98cde09d0d4a8a88d98..faa2046980bf96b7460afb1f9c8fe83f00221846 100644 (file)
--- a/ao-tools/altosui/AltosUI.java
+++ b/ao-tools/altosui/AltosUI.java
@@ -92,8 +92,11 @@ class AltosFlightInfoTableModel extends AbstractTableModel {
 
        public int getRowCount() { return 20; }
 
+       int     current_row = 0;
+       int     prev_num_rows = 0;
+
        public Object getValueAt(int row, int col) {
-               if (row >= rows.size())
+               if (row >= prev_num_rows)
                        return "";
                if (col == 0)
                        return rows.get(row).name;
@@ -101,9 +104,6 @@ class AltosFlightInfoTableModel extends AbstractTableModel {
                        return rows.get(row).value;
        }
 
-       int     current_row = 0;
-       int     prev_num_rows = 0;
-
        public void resetRow() {
                current_row = 0;
        }
@@ -115,10 +115,9 @@ class AltosFlightInfoTableModel extends AbstractTableModel {
                current_row++;
        }
        public void finish() {
-               if (current_row > prev_num_rows) {
+               if (current_row > prev_num_rows)
                        fireTableRowsInserted(prev_num_rows, current_row - 1);
-                       prev_num_rows = current_row;
-               }
+               prev_num_rows = current_row;
                fireTableDataChanged();
        }
 }
@@ -310,13 +309,13 @@ public class AltosUI extends JFrame {
                                info_add_row(1, "Pad GPS alt", "%6.0f m", 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);
+                                      state.gps.year,
+                                      state.gps.month,
+                                      state.gps.day);
                        info_add_row(1, "GPS time", "  %02d:%02d:%02d",
-                                      state.gps.gps_time.hour,
-                                      state.gps.gps_time.minute,
-                                      state.gps.gps_time.second);
+                                      state.gps.hour,
+                                      state.gps.minute,
+                                      state.gps.second);
                        int     nsat_vis = 0;
                        int     c;