altosui: Split status and info panels into separate files

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

diff --git a/ao-tools/altosui/AltosUI.java b/ao-tools/altosui/AltosUI.java
index 4994f093dcbfed6eb80e7c9534a2715fea65843a..58f39de5efcd22868d8c69b7fbc617d4a6c725ab 100644 (file)
--- a/ao-tools/altosui/AltosUI.java
+++ b/ao-tools/altosui/AltosUI.java
@@ -28,6 +28,7 @@ import java.text.*;
 import java.util.prefs.*;
 import java.util.concurrent.LinkedBlockingQueue;
 
+import altosui.Altos;
 import altosui.AltosSerial;
 import altosui.AltosSerialMonitor;
 import altosui.AltosTelemetry;
@@ -36,92 +37,11 @@ import altosui.AltosDeviceDialog;
 import altosui.AltosPreferences;
 import altosui.AltosLog;
 import altosui.AltosVoice;
+import altosui.AltosFlightStatusTableModel;
+import altosui.AltosFlightInfoTableModel;
 
 import libaltosJNI.*;
 
-class AltosFlightStatusTableModel extends AbstractTableModel {
-       private String[] columnNames = {"Height (m)", "State", "RSSI (dBm)", "Speed (m/s)" };
-       private Object[] data = { 0, "idle", 0, 0 };
-
-       public int getColumnCount() { return columnNames.length; }
-       public int getRowCount() { return 2; }
-       public Object getValueAt(int row, int col) {
-               if (row == 0)
-                       return columnNames[col];
-               return data[col];
-       }
-
-       public void setValueAt(Object value, int col) {
-               data[col] = value;
-               fireTableCellUpdated(1, col);
-       }
-
-       public void setValueAt(Object value, int row, int col) {
-               setValueAt(value, col);
-       }
-
-       public void set(AltosState state) {
-               setValueAt(String.format("%1.0f", state.height), 0);
-               setValueAt(state.data.state, 1);
-               setValueAt(state.data.rssi, 2);
-               double speed = state.baro_speed;
-               if (state.ascent)
-                       speed = state.speed;
-               setValueAt(String.format("%1.0f", speed), 3);
-       }
-}
-
-class AltosFlightInfoTableModel extends AbstractTableModel {
-       private String[] columnNames = {"Field", "Value"};
-
-       class InfoLine {
-               String  name;
-               String  value;
-
-               public InfoLine(String n, String v) {
-                       name = n;
-                       value = v;
-               }
-       }
-
-       private ArrayList<InfoLine> rows = new ArrayList<InfoLine>();
-
-       public int getColumnCount() { return columnNames.length; }
-       public String getColumnName(int col) { return columnNames[col]; }
-
-       public int getRowCount() { return 20; }
-
-       public Object getValueAt(int row, int col) {
-               if (row >= rows.size())
-                       return "";
-               if (col == 0)
-                       return rows.get(row).name;
-               else
-                       return rows.get(row).value;
-       }
-
-       int     current_row = 0;
-       int     prev_num_rows = 0;
-
-       public void resetRow() {
-               current_row = 0;
-       }
-       public void addRow(String name, String value) {
-               if (current_row >= rows.size())
-                       rows.add(current_row, new InfoLine(name, value));
-               else
-                       rows.set(current_row, new InfoLine(name, value));
-               current_row++;
-       }
-       public void finish() {
-               if (current_row > prev_num_rows) {
-                       fireTableRowsInserted(prev_num_rows, current_row - 1);
-                       prev_num_rows = current_row;
-               }
-               fireTableDataChanged();
-       }
-}
-
 public class AltosUI extends JFrame {
        private int channel = -1;
 
@@ -309,13 +229,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;
 
@@ -344,7 +264,7 @@ public class AltosUI extends JFrame {
                                return;
 
                        /* reset the landing count once we hear about a new flight */
-                       if (state.state < AltosTelemetry.ao_flight_drogue)
+                       if (state.state < Altos.ao_flight_drogue)
                                reported_landing = 0;
 
                        /* Shut up once the rocket is on the ground */
@@ -353,7 +273,7 @@ public class AltosUI extends JFrame {
                        }
 
                        /* If the rocket isn't on the pad, then report height */
-                       if (state.state > AltosTelemetry.ao_flight_pad) {
+                       if (state.state > Altos.ao_flight_pad) {
                                voice.speak("%d meters", (int) (state.height + 0.5));
                        } else {
                                reported_landing = 0;
@@ -366,7 +286,7 @@ public class AltosUI extends JFrame {
                        if (!state.ascent &&
                            (last ||
                             System.currentTimeMillis() - state.report_time >= 15000 ||
-                            state.state == AltosTelemetry.ao_flight_landed))
+                            state.state == Altos.ao_flight_landed))
                        {
                                if (Math.abs(state.baro_speed) < 20 && state.height < 100)
                                        voice.speak("rocket landed safely");
@@ -401,12 +321,12 @@ public class AltosUI extends JFrame {
        private void tell(AltosState state, AltosState old_state) {
                if (old_state == null || old_state.state != state.state) {
                        voice.speak(state.data.state);
-                       if ((old_state == null || old_state.state <= AltosTelemetry.ao_flight_boost) &&
-                           state.state > AltosTelemetry.ao_flight_boost) {
+                       if ((old_state == null || old_state.state <= Altos.ao_flight_boost) &&
+                           state.state > Altos.ao_flight_boost) {
                                voice.speak("max speed: %d meters per second.",
                                            (int) (state.max_speed + 0.5));
-                       } else if ((old_state == null || old_state.state < AltosTelemetry.ao_flight_drogue) &&
-                                  state.state >= AltosTelemetry.ao_flight_drogue) {
+                       } else if ((old_state == null || old_state.state < Altos.ao_flight_drogue) &&
+                                  state.state >= Altos.ao_flight_drogue) {
                                voice.speak("max height: %d meters.",
                                            (int) (state.max_height + 0.5));
                        }
@@ -617,7 +537,7 @@ public class AltosUI extends JFrame {
         * a TeleDongle over the packet link
         */
        private void SaveFlightData() {
-               new AltosEeprom(AltosUI.this);
+               new AltosEepromDownload(AltosUI.this);
        }
 
        /* Create the AltosUI menus