altosui: Add config and pyro tabs to graph widget master
authorKeith Packard <keithp@keithp.com>
Sun, 12 May 2024 02:03:51 +0000 (19:03 -0700)
committerKeith Packard <keithp@keithp.com>
Sun, 12 May 2024 02:04:53 +0000 (19:04 -0700)
Show the flight computer configuration in the graph when available.

Signed-off-by: Keith Packard <keithp@keithp.com>
altoslib/AltosConfigData.java
altoslib/AltosDataListener.java
altoslib/AltosLib.java
altoslib/AltosRecordSet.java
altoslib/AltosTelemetryFile.java
altosui/AltosConfigFCUI.java
altosui/AltosGraphUI.java
altosuilib/AltosFlightConfigTable.java [new file with mode: 0644]
altosuilib/AltosFlightPyroTable.java [new file with mode: 0644]
altosuilib/Makefile.am

index 6b980be6b641dd784e06c020d07a743eea036b0c..b076357d77af888e0030919548dbbbfe9529df8c 100644 (file)
@@ -245,6 +245,10 @@ public class AltosConfigData {
                return false;
        }
 
+       public boolean has_radio() {
+               return product.startsWith("Tele");
+       }
+
        int[] parse_version(String v) {
                String[] parts = v.split("\\.");
                int r[] = new int[parts.length];
index b19cbedbbdb513b914a6edf1bbe55cf58af2608f..18ffd988299a63cb2821d1c0eae5df6221f016dd 100644 (file)
@@ -39,6 +39,10 @@ public abstract class AltosDataListener {
                return cal_data;
        }
 
+       public AltosConfigData config_data() {
+               return null;
+       }
+
        public void set_time(double time) {
                if (time != AltosLib.MISSING)
                        this.time = time;
index fbbfd63c3e7cc7f207ace6907b83ea0e73e4d16a..dd2a4baea86563e24ad5a305e8f649dd84ba1d5c 100644 (file)
@@ -235,6 +235,30 @@ public class AltosLib {
                "Compressed", "Uncompressed"
        };
 
+       public static final String[] ignite_mode_values = {
+               "Dual Deploy",
+               "Redundant Apogee",
+               "Redundant Main",
+               "Separation & Apogee",
+       };
+
+       public static final String[]    pad_orientation_values_radio = {
+               "Antenna Up",
+               "Antenna Down",
+       };
+
+       public static final String[]    pad_orientation_values_no_radio = {
+               "Beeper Up",
+               "Beeper Down",
+       };
+
+       public static String[] pad_orientation_values(boolean radio) {
+               if (radio)
+                       return pad_orientation_values_radio;
+               else
+                       return pad_orientation_values_no_radio;
+       }
+
        public static final String launch_sites_url = "https://maps.altusmetrum.org/launch-sites.txt";
        public static final String launch_sites_env = "LAUNCH_SITES";
 //     public static final String launch_sites_url = "file:///home/keithp/misc/text/altusmetrum/AltOS/launch-sites.txt";
index c889cdab0619acf33be7748579f08e18465a91ba..b6be02a58c787595e55220409d274553f97a6276 100644 (file)
@@ -18,6 +18,7 @@ import java.util.*;
 
 public interface AltosRecordSet {
        public AltosCalData cal_data();
+       public AltosConfigData config_data();
        public void capture_series(AltosDataListener listener);
        public boolean valid();
 }
index 6f01f51c180be81d53f54471401a14c328ef23bc..5ba32518a3fff5fb1dedef4e757578f550574660 100644 (file)
@@ -138,6 +138,10 @@ public class AltosTelemetryFile implements AltosRecordSet {
                listener.finish();
        }
 
+       public AltosConfigData config_data() {
+               return null;
+       }
+
        public AltosTelemetryFile(FileInputStream input) throws IOException {
                telems = new AltosTelemetryIterable(input);
        }
index 3e5bede5169718a291533600d878fe50589a86fc..9d39cda1bf820e0c898b8a3b1d5633881c57b5f2 100644 (file)
@@ -123,13 +123,6 @@ public class AltosConfigFCUI
                "0", "5", "10", "15", "20"
        };
 
-       static String[]         ignite_mode_values = {
-               "Dual Deploy",
-               "Redundant Apogee",
-               "Redundant Main",
-               "Separation & Apogee",
-       };
-
        static String[]         aprs_interval_values = {
                "Disabled",
                "2",
@@ -154,16 +147,6 @@ public class AltosConfigFCUI
                "4250",
        };
 
-       static String[]         pad_orientation_values_radio = {
-               "Antenna Up",
-               "Antenna Down",
-       };
-
-       static String[]         pad_orientation_values_no_radio = {
-               "Beeper Up",
-               "Beeper Down",
-       };
-
        String[] pad_orientation_values;
 
        static String[]         tracker_motion_values_m = {
@@ -328,11 +311,7 @@ public class AltosConfigFCUI
        }
 
        void set_pad_orientation_values() {
-               String [] new_values;
-               if (has_radio())
-                       new_values = pad_orientation_values_radio;
-               else
-                       new_values = pad_orientation_values_no_radio;
+               String [] new_values = AltosLib.pad_orientation_values(has_radio());
                if (new_values != pad_orientation_values) {
                        int id = pad_orientation_value.getSelectedIndex();
                        pad_orientation_value.removeAllItems();
@@ -893,7 +872,7 @@ public class AltosConfigFCUI
                c.anchor = GridBagConstraints.LINE_START;
                c.insets = ir;
                c.ipady = 5;
-               ignite_mode_value = new JComboBox<String>(ignite_mode_values);
+               ignite_mode_value = new JComboBox<String>(AltosLib.ignite_mode_values);
                ignite_mode_value.setEditable(false);
                ignite_mode_value.addItemListener(this);
                pane.add(ignite_mode_value, c);
@@ -919,7 +898,7 @@ public class AltosConfigFCUI
                c.anchor = GridBagConstraints.LINE_START;
                c.insets = ir;
                c.ipady = 5;
-               pad_orientation_values = pad_orientation_values_no_radio;
+               pad_orientation_values = AltosLib.pad_orientation_values(false);
 
                pad_orientation_value = new JComboBox<String>(pad_orientation_values);
                pad_orientation_value.setEditable(false);
@@ -1453,7 +1432,7 @@ public class AltosConfigFCUI
 
        public void set_ignite_mode(int new_ignite_mode) {
                if (new_ignite_mode != AltosLib.MISSING) {
-                       if (new_ignite_mode >= ignite_mode_values.length)
+                       if (new_ignite_mode >= AltosLib.ignite_mode_values.length)
                                new_ignite_mode = 0;
                        if (new_ignite_mode < 0) {
                                ignite_mode_value.setEnabled(false);
index 127a5beb0fd1566dc8ca28ca56a25b68ca892f15..8f52728bf13cfe1ea9d6c5e95a0e104d341e3440 100644 (file)
@@ -39,6 +39,8 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
        AltosUIMap              map;
        AltosFlightStats        stats;
        AltosFlightStatsTable   statsTable;
+       AltosFlightConfigTable  configTable;
+       AltosFlightPyroTable    pyroTable;
        AltosGPS                gps;
        boolean                 has_gps;
 
@@ -77,6 +79,10 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
                        map.font_size_changed(font_size);
                if (statsTable != null)
                        statsTable.font_size_changed(font_size);
+               if (configTable != null)
+                       configTable.font_size_changed(font_size);
+               if (pyroTable != null)
+                       pyroTable.font_size_changed(font_size);
        }
 
        public void units_changed(boolean imperial_units) {
@@ -84,6 +90,10 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
                        map.units_changed(imperial_units);
                if (enable != null)
                        enable.units_changed(imperial_units);
+               if (configTable != null)
+                       configTable.units_changed(imperial_units);
+               if (pyroTable != null)
+                       pyroTable.units_changed(imperial_units);
        }
 
        AltosUIFlightSeries flight_series;
@@ -106,7 +116,7 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
        AltosGraphUI(AltosRecordSet set, File file) throws InterruptedException, IOException {
                super(file.getName());
                AltosCalData    cal_data = set.cal_data();
-
+               AltosConfigData config_data = set.config_data();
 
                pane = new JTabbedPane();
 
@@ -127,6 +137,14 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
                pane.add("Flight Graph", graph.panel);
                pane.add("Configure Graph", enable);
                pane.add("Flight Statistics", statsTable);
+               if (config_data != null) {
+                       configTable = new AltosFlightConfigTable(config_data);
+                       pane.add("Configuration", configTable);
+                       if (config_data.npyro > 0) {
+                               pyroTable = new AltosFlightPyroTable(config_data.pyros, config_data.npyro);
+                               pane.add("Pyros", pyroTable);
+                       }
+               }
 
                has_gps = false;
                fill_map(flight_series);
diff --git a/altosuilib/AltosFlightConfigTable.java b/altosuilib/AltosFlightConfigTable.java
new file mode 100644 (file)
index 0000000..4f9714f
--- /dev/null
@@ -0,0 +1,189 @@
+/*
+ * Copyright © 2024 Keith Packard <keithp@keithp.com>
+ *
+ * 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; 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+package org.altusmetrum.altosuilib_14;
+
+import java.awt.*;
+import javax.swing.*;
+import java.util.*;
+import org.altusmetrum.altoslib_14.*;
+
+public class AltosFlightConfigTable extends JComponent
+       implements AltosFontListener, AltosUnitsListener
+{
+       GridBagLayout   layout;
+
+       FlightConfig[] flight_configs;
+       AltosConfigData config_data;
+
+       class FlightConfig implements AltosFontListener {
+               JLabel          label;
+               JLabel[]        value;
+
+               public void font_size_changed(int font_size) {
+                       label.setFont(AltosUILib.label_font);
+                       for (int i = 0; i < value.length; i++)
+                               value[i].setFont(AltosUILib.value_font);
+               }
+
+               public void set(String l, String[] values) {
+                       label.setText(l);
+                       for (int j = 0; j < values.length; j++)
+                               value[j].setText(values[j]);
+               }
+
+               public FlightConfig(GridBagLayout layout, int y, String label_text, String ... values) {
+                       GridBagConstraints      c = new GridBagConstraints();
+                       c.insets = new Insets(AltosUILib.tab_elt_pad, AltosUILib.tab_elt_pad, AltosUILib.tab_elt_pad, AltosUILib.tab_elt_pad);
+                       c.weighty = 1;
+
+                       label = new JLabel(label_text);
+                       label.setFont(AltosUILib.label_font);
+                       label.setHorizontalAlignment(SwingConstants.LEFT);
+                       c.gridx = 0; c.gridy = y;
+                       c.anchor = GridBagConstraints.WEST;
+                       c.fill = GridBagConstraints.VERTICAL;
+                       c.weightx = 0;
+                       layout.setConstraints(label, c);
+                       add(label);
+
+                       value = new JLabel[values.length];
+                       for (int j = 0; j < values.length; j++) {
+                               value[j] = new JLabel(values[j]);
+                               value[j].setFont(AltosUILib.value_font);
+                               c.gridx = j+1; c.gridy = y;
+                               c.anchor = GridBagConstraints.CENTER;
+                               c.fill = GridBagConstraints.BOTH;
+                               c.weightx = 1;
+                               layout.setConstraints(value[j], c);
+                               add(value[j]);
+                       }
+                       flight_configs[y] = this;
+               }
+
+       }
+
+       private FlightConfig set_config(int y, String label, String ... values) {
+               if (flight_configs[y] == null)
+                       flight_configs[y] = new FlightConfig(layout, y, label, values);
+               else
+                       flight_configs[y].set(label, values);
+               return flight_configs[y];
+       }
+
+       public void font_size_changed(int font_size) {
+               for (int y = 0; flight_configs[y] != null; y++)
+                       flight_configs[y].font_size_changed(font_size);
+       }
+
+       private String main_deploy_label() {
+               return String.format("Main Deploy Altitude(%s)", AltosConvert.height.parse_units());
+       }
+
+       private String main_deploy_value() {
+               return String.format("%-6.1f", AltosConvert.height.value(config_data.main_deploy, AltosConvert.imperial_units));
+       }
+
+       public void set_config() {
+               int y = 0;
+               if (config_data.serial != AltosLib.MISSING) {
+                       if (config_data.product != null && config_data.version != null)
+                               set_config(y++, "Device",
+                                          config_data.product,
+                                          String.format("version %s", config_data.version),
+                                          String.format("serial %d", config_data.serial));
+                       else
+                               set_config(y++, "Serial", String.format("%d", config_data.serial));
+               }
+               if (config_data.flight != AltosLib.MISSING)
+                       set_config(y++, "Flight", String.format("%d", config_data.flight));
+               if (config_data.main_deploy != AltosLib.MISSING)
+                       set_config(y++, main_deploy_label(), main_deploy_value());
+               if (config_data.apogee_delay != AltosLib.MISSING)
+                       set_config(y++, "Apogee Delay(s)", String.format("%d", config_data.apogee_delay));
+               if (config_data.apogee_lockout != AltosLib.MISSING)
+                       set_config(y++, "Apogee Lockout(s)", String.format("%d", config_data.apogee_lockout));
+               if (config_data.radio_frequency != AltosLib.MISSING)
+                       set_config(y++, "Radio Frequency (MHz)", String.format("%-7.3f", config_data.radio_frequency / 1000.0));
+               if (config_data.radio_calibration != AltosLib.MISSING)
+                       set_config(y++, "Radio Calibration", String.format("%d", config_data.radio_calibration));
+               if (config_data.radio_enable != AltosLib.MISSING)
+                       set_config(y++, "Radio Enable", String.format("%b", config_data.radio_enable != 0));
+               if (config_data.radio_10mw != AltosLib.MISSING)
+                       set_config(y++, "Limit transmit to 10mW", String.format("%b", config_data.radio_10mw != 0));
+               if (config_data.report_feet != AltosLib.MISSING)
+                       set_config(y++, "Beep max height in", config_data.report_feet == 0 ? "Meters" : "Feet");
+               if (config_data.gps_receiver != AltosLib.MISSING)
+                       set_config(y++, "GPS Receiver", AltosLib.gps_receiver_names[config_data.gps_receiver]);
+               if (config_data.telemetry_rate != AltosLib.MISSING)
+                       set_config(y++, "Telemetry baud rate", String.format("%d", AltosLib.ao_telemetry_rate_values[config_data.telemetry_rate]));
+               if (config_data.aprs_interval != AltosLib.MISSING)
+                       set_config(y++, "APRS Interval(s)", String.format("%d", config_data.aprs_interval));
+               if (config_data.aprs_ssid != AltosLib.MISSING)
+                       set_config(y++, "APRS SSID", String.format("%d", config_data.aprs_ssid));
+               if (config_data.aprs_format != AltosLib.MISSING)
+                       set_config(y++, "APRS Format", AltosLib.ao_aprs_format_name[config_data.aprs_format]);
+               if (config_data.callsign != null)
+                       set_config(y++, "Callsign", config_data.callsign);
+               if (config_data.flight_log_max != AltosLib.MISSING)
+                       set_config(y++, "Maximum Flight Log Size(kB)", String.format("%d", config_data.flight_log_max));
+               if (config_data.ignite_mode != AltosLib.MISSING)
+                       set_config(y++, "Igniter Firing Mode", AltosLib.ignite_mode_values[config_data.ignite_mode]);
+               if (config_data.pad_orientation != AltosLib.MISSING)
+                       set_config(y++, "Pad Orientation", AltosLib.pad_orientation_values(config_data.has_radio())[config_data.pad_orientation]);
+               if (config_data.accel_cal_plus != AltosLib.MISSING)
+                       set_config(y++, "Accel Calibration",
+                                  String.format("Plus %d", config_data.accel_cal_plus),
+                                  String.format("Minus %d", config_data.accel_cal_minus));
+               if (config_data.beep != AltosLib.MISSING)
+                       set_config(y++, "Beeper(Hz)",
+                                  config_data.beep == 0 ? "Disabled" :
+                                  String.format("%-7.1f", AltosConvert.beep_value_to_freq(config_data.beep)));
+               if (config_data.tracker_motion != AltosLib.MISSING)
+                       set_config(y++,
+                                  String.format("Logging Trigger Motion (%s):", AltosConvert.height.parse_units()),
+                                  String.format("%-6.1f",
+                                                AltosConvert.height.value(config_data.tracker_motion, AltosConvert.imperial_units)));
+               if (config_data.tracker_interval != AltosLib.MISSING)
+                       set_config(y++, "Position Reporting Interval(s)",
+                                  String.format("%d", config_data.tracker_interval));
+       }
+
+       public void units_changed(boolean imperial_units) {
+               set_config();
+       }
+
+       public void tell_closing() {
+               AltosUIPreferences.unregister_font_listener(this);
+       }
+
+       public AltosFlightConfigTable() {
+               layout = new GridBagLayout();
+
+               setLayout(layout);
+
+               AltosUIPreferences.register_font_listener(this);
+       }
+
+       public AltosFlightConfigTable(AltosConfigData config_data) {
+               this();
+               this.config_data = config_data;
+               flight_configs = new FlightConfig[30];
+               set_config();
+       }
+}
diff --git a/altosuilib/AltosFlightPyroTable.java b/altosuilib/AltosFlightPyroTable.java
new file mode 100644 (file)
index 0000000..5e27a2f
--- /dev/null
@@ -0,0 +1,184 @@
+/*
+ * Copyright © 2024 Keith Packard <keithp@keithp.com>
+ *
+ * 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; 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+package org.altusmetrum.altosuilib_14;
+
+import java.awt.*;
+import javax.swing.*;
+import java.util.*;
+import org.altusmetrum.altoslib_14.*;
+
+public class AltosFlightPyroTable extends JComponent
+       implements AltosFontListener, AltosUnitsListener
+{
+       GridBagLayout   layout;
+       AltosPyro[]     pyros;
+       int             npyro;
+       FlightPyro[]    flight_pyros;
+
+       class FlightPyro implements AltosFontListener {
+               JLabel          label;
+               JTextField[]    text_fields;
+
+               public void font_size_changed(int font_size) {
+                       label.setFont(AltosUILib.label_font);
+                       for (int i = 0; i < text_fields.length; i++)
+                               text_fields[i].setFont(AltosUILib.value_font);
+               }
+
+               public void set_value(int y, int p, String value) {
+                       GridBagConstraints      c = new GridBagConstraints();
+                       c.insets = new Insets(AltosUILib.tab_elt_pad, AltosUILib.tab_elt_pad, AltosUILib.tab_elt_pad, AltosUILib.tab_elt_pad);
+                       c.weighty = 1;
+                       JTextField      text_field;
+
+                       if (text_fields[p] == null) {
+                               text_field = new JTextField(value);
+                               text_field.setEditable(false);
+                               text_field.setFont(AltosUILib.value_font);
+                               text_field.setHorizontalAlignment(SwingConstants.RIGHT);
+                               c.gridx = p+1; c.gridy = y;
+                               c.anchor = GridBagConstraints.EAST;
+                               c.fill = GridBagConstraints.BOTH;
+                               c.weightx = 1;
+                               layout.setConstraints(text_field, c);
+                               add(text_field);
+                               text_fields[p] = text_field;
+                       } else {
+                               text_fields[p].setText(value);
+                       }
+               }
+
+               public void set_label(String text) {
+                       label.setText(text);
+               }
+
+               public FlightPyro(GridBagLayout layout, int y, String label_text, int npyro) {
+                       GridBagConstraints      c = new GridBagConstraints();
+                       c.insets = new Insets(AltosUILib.tab_elt_pad, AltosUILib.tab_elt_pad, AltosUILib.tab_elt_pad, AltosUILib.tab_elt_pad);
+                       c.weighty = 1;
+
+                       if (label_text != null) {
+                               label = new JLabel(label_text);
+                               label.setFont(AltosUILib.label_font);
+                               label.setHorizontalAlignment(SwingConstants.LEFT);
+                               c.gridx = 0; c.gridy = y;
+                               c.anchor = GridBagConstraints.WEST;
+                               c.fill = GridBagConstraints.VERTICAL;
+                               c.weightx = 0;
+                               layout.setConstraints(label, c);
+                               add(label);
+                       }
+
+                       text_fields = new JTextField[npyro];
+               }
+       }
+
+       public void font_size_changed(int font_size) {
+               for (int i = 0; i < flight_pyros.length; i++)
+                       flight_pyros[i].font_size_changed(font_size);
+       }
+
+       public void set_pyros() {
+               int nrow = 1;
+               for (int flag = 1; flag < AltosPyro.pyro_all; flag <<= 1) {
+                       if ((AltosPyro.pyro_all_useful & flag) != 0) {
+                               for (int p = 0; p < npyro; p++) {
+                                       if ((pyros[p].flags & flag) != 0) {
+                                               String text;
+                                               double  value = pyros[p].get_value(flag);
+                                               if ((flag & AltosPyro.pyro_state_value) != 0) {
+                                                       text = AltosLib.state_name_capital((int) value);
+                                               } else {
+                                                       double  scale = AltosPyro.pyro_to_scale(flag);
+                                                       double  unit_value = value;
+                                                       AltosUnits units = AltosPyro.pyro_to_units(flag);
+                                                       if (units != null)
+                                                               unit_value = units.parse_value(value);
+                                                       String  format;
+                                                       if (scale >= 100)
+                                                               format = "%6.2f";
+                                                       else if (scale >= 10)
+                                                               format = "%6.1f";
+                                                       else
+                                                               format = "%6.0f";
+                                                       text = String.format(format, unit_value);
+                                               }
+                                               flight_pyros[nrow].set_value(nrow, p, text);
+                                       }
+                               }
+                               nrow++;
+                       }
+               }
+       }
+
+       public void units_changed(boolean imperial_units) {
+               System.out.printf("units changed\n");
+               int nrow = 1;
+               for (int flag = 1; flag < AltosPyro.pyro_all; flag <<= 1) {
+                       if ((AltosPyro.pyro_all_useful & flag) != 0) {
+                               String name = AltosPyro.pyro_to_name(flag);
+                               flight_pyros[nrow].set_label(name);
+                       }
+               }
+               set_pyros();
+       }
+
+       public void tell_closing() {
+               AltosUIPreferences.unregister_font_listener(this);
+       }
+
+       public AltosFlightPyroTable(AltosPyro[] pyros, int npyro) {
+               layout = new GridBagLayout();
+
+               int nrow = 0;
+
+               for (int flag = 1; flag < AltosPyro.pyro_all; flag <<= 1) {
+                       if ((AltosPyro.pyro_all_useful & flag) != 0) {
+                               nrow++;
+                       }
+               }
+
+               flight_pyros = new FlightPyro[nrow + 1];
+
+               nrow = 0;
+
+               flight_pyros[0] = new FlightPyro(layout, 0, null, npyro);
+
+               for (int p = 0; p < npyro; p++) {
+                       flight_pyros[0].set_value(0, p, String.format("Channel %c", 'A' + p));
+               }
+               nrow++;
+               for (int flag = 1; flag < AltosPyro.pyro_all; flag <<= 1) {
+                       if ((AltosPyro.pyro_all_useful & flag) != 0) {
+                               String name = AltosPyro.pyro_to_name(flag);
+                               flight_pyros[nrow] = new FlightPyro(layout, nrow, name, npyro);
+                               nrow++;
+                       }
+               }
+
+
+               this.pyros = pyros;
+               this.npyro = npyro;
+
+               set_pyros();
+
+               setLayout(layout);
+               AltosUIPreferences.register_font_listener(this);
+       }
+}
index 10a5b494d3883477f3030aaeeaaebab22cb491d8..12bdaaa778ea7c9ae1169e12ff6cc987f1e5e510 100644 (file)
@@ -51,7 +51,9 @@ altosuilib_JAVA = \
        AltosFlashUI.java \
        AltosRomconfigUI.java \
        AltosInfoTable.java \
+       AltosFlightConfigTable.java \
        AltosFlightInfoTableModel.java \
+       AltosFlightPyroTable.java \
        AltosFlightStatsTable.java \
        AltosBTDevice.java \
        AltosBTDeviceIterator.java \