Remove unused cell renderer class
[fw/altos] / ao-tools / altosui / AltosUI.java
index 7befe778cca7102318c9f04546937388a07b4a0a..8880618b251b3c2b4daa68a6673caa474721d950 100644 (file)
@@ -52,7 +52,7 @@ class AltosFlightStatusTableModel extends AbstractTableModel {
 
        public void setValueAt(Object value, int col) {
                data[col] = value;
-               fireTableCellUpdated(0, col);
+               fireTableCellUpdated(1, col);
        }
 
        public void setValueAt(Object value, int row, int col) {
@@ -70,26 +70,6 @@ class AltosFlightStatusTableModel extends AbstractTableModel {
        }
 }
 
-class AltosFlightStatusCellRenderer extends DefaultTableCellRenderer {
-
-       static Font statusFont = new Font("SansSerif", Font.BOLD, 24);
-
-       @Override public Component getTableCellRendererComponent (JTable table, Object value, boolean isSelected,
-                                                       boolean hasFocus, int row, int column)
-       {
-               Component cell = super.getTableCellRendererComponent
-                       (table, value, isSelected, hasFocus, row, column);
-               System.out.println("Selecting new font for cell " + row + " " + column + " " + statusFont);
-               cell.setFont(statusFont);
-               return cell;
-       }
-
-       public AltosFlightStatusCellRenderer () {
-               super();
-               System.out.println("Made a status cell renderer\n");
-       }
-}
-
 class AltosFlightInfoTableModel extends AbstractTableModel {
        private String[] columnNames = {"Field", "Value"};
 
@@ -214,7 +194,7 @@ public class AltosUI extends JFrame {
                serialLine = new AltosSerial();
                serialLine.monitor(new AltosUIMonitor());
                int dpi = Toolkit.getDefaultToolkit().getScreenResolution();
-               this.setSize(new Dimension (infoValueMetrics.charWidth('0') * 6 * 15,
+               this.setSize(new Dimension (infoValueMetrics.charWidth('0') * 6 * 20,
                                            statusHeight * 4 + infoHeight * 17));
                this.validate();
                setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
@@ -273,7 +253,7 @@ public class AltosUI extends JFrame {
                if (state.npad >= MIN_PAD_SAMPLES)
                        info_add_row(0, "Ground state", "%s", "ready");
                else
-                       info_add_row(0, "Ground state", "waiting for gps (%d)",
+                       info_add_row(0, "Ground state", "wait (%d)",
                                     MIN_PAD_SAMPLES - state.npad);
                info_add_row(0, "Rocket state", "%s", state.data.state);
                info_add_row(0, "Callsign", "%s", state.data.callsign);
@@ -292,56 +272,63 @@ public class AltosUI extends JFrame {
                info_add_row(0, "Drogue", "%9.2f V", state.drogue_sense);
                info_add_row(0, "Main", "%9.2f V", state.main_sense);
                info_add_row(0, "Pad altitude", "%6.0f    m", state.ground_altitude);
-               if (state.gps != null)
-                       info_add_row(1, "Satellites", "%6d", state.gps.nsat);
-               else
-                       info_add_row(1, "Satellites", "%6d", 0);
-               if (state.gps != null && state.gps.gps_locked) {
-                       info_add_row(1, "GPS", "locked");
-               } else if (state.gps != null && state.gps.gps_connected) {
-                       info_add_row(1, "GPS", "unlocked");
-               } else {
+               if (state.gps == null) {
                        info_add_row(1, "GPS", "not available");
-               }
-               if (state.gps != null) {
+               } else {
+                       if (state.data.gps.gps_locked)
+                               info_add_row(1, "GPS", "   locked");
+                       else if (state.data.gps.gps_connected)
+                               info_add_row(1, "GPS", " unlocked");
+                       else
+                               info_add_row(1, "GPS", "  missing");
+                       info_add_row(1, "Satellites", "%6d", state.data.gps.nsat);
                        info_add_deg(1, "Latitude", state.gps.lat, 'N', 'S');
                        info_add_deg(1, "Longitude", state.gps.lon, 'E', 'W');
-                       info_add_row(1, "GPS altitude", "%d", state.gps.alt);
-                       info_add_row(1, "GPS height", "%d", state.gps_height);
+                       info_add_row(1, "GPS altitude", "%6d", state.gps.alt);
+                       info_add_row(1, "GPS height", "%6.0f", state.gps_height);
+
+                       /* The SkyTraq GPS doesn't report these values */
+                       if (false) {
+                               info_add_row(1, "GPS ground speed", "%8.1f m/s %3d°",
+                                            state.gps.ground_speed,
+                                            state.gps.course);
+                               info_add_row(1, "GPS climb rate", "%8.1f m/s",
+                                            state.gps.climb_rate);
+                               info_add_row(1, "GPS error", "%6d m(h)%3d m(v)",
+                                            state.gps.h_error, state.gps.v_error);
+                       }
+                       info_add_row(1, "GPS hdop", "%8.1f", state.gps.hdop);
+
+                       if (state.npad > 0) {
+                               if (state.from_pad != null) {
+                                       info_add_row(1, "Distance from pad", "%6.0f m", state.from_pad.distance);
+                                       info_add_row(1, "Direction from pad", "%6.0f°", state.from_pad.bearing);
+                               } else {
+                                       info_add_row(1, "Distance from pad", "unknown");
+                                       info_add_row(1, "Direction from pad", "unknown");
+                               }
+                               info_add_deg(1, "Pad latitude", state.pad_lat, 'N', 'S');
+                               info_add_deg(1, "Pad longitude", state.pad_lon, 'E', 'W');
+                               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);
-                       info_add_row(1, "GPS time", "%02d:%02d:%02d",
+                       info_add_row(1, "GPS time", "  %02d:%02d:%02d",
                                       state.gps.gps_time.hour,
                                       state.gps.gps_time.minute,
                                       state.gps.gps_time.second);
-                       info_add_row(1, "GPS ground speed", "%7.1fm/s %d°",
-                                      state.gps.ground_speed,
-                                      state.gps.course);
-                       info_add_row(1, "GPS climb rate", "%7.1fm/s",
-                                    state.gps.climb_rate);
-                       info_add_row(1, "GPS precision", "%4.1f(hdop) %3dm(h) %3dm(v)",
-                                    state.gps.hdop, state.gps.h_error, state.gps.v_error);
-               }
-               if (state.npad > 0) {
-                       info_add_row(1, "Distance from pad", "%5.0fm", state.from_pad.distance);
-                       info_add_row(1, "Direction from pad", "%4.0f°", state.from_pad.bearing);
-                       info_add_deg(1, "Pad latitude", state.pad_lat, 'N', 'S');
-                       info_add_deg(1, "Pad longitude", state.pad_lon, 'E', 'W');
-                       info_add_row(1, "Pad GPS alt", "%gm", state.pad_alt);
-               }
-               if (state.gps != null && state.gps.gps_connected) {
                        int     nsat_vis = 0;
                        int     c;
 
                        if (state.gps.cc_gps_sat == null)
-                               info_add_row(2, "Satellites Visible", "%d", 0);
+                               info_add_row(2, "Satellites Visible", "%4d", 0);
                        else {
-                               info_add_row(2, "Satellites Visible", "%d", state.gps.cc_gps_sat.length);
+                               info_add_row(2, "Satellites Visible", "%4d", state.gps.cc_gps_sat.length);
                                for (c = 0; c < state.gps.cc_gps_sat.length; c++) {
                                        info_add_row(2, "Satellite id,C/N0",
-                                                    "%3d,%2d",
+                                                    "%4d, %4d",
                                                     state.gps.cc_gps_sat[c].svid,
                                                     state.gps.cc_gps_sat[c].c_n0);
                                }
@@ -430,8 +417,11 @@ public class AltosUI extends JFrame {
                        filename = name;
                }
 
+               /* Run the replay in a separate thread
+                * so that the UI can update
+                */
                public void run() {
-                       String  line;
+                       String          line;
                        AltosState      state = null;
                        try {
                                while ((line = readline(replay)) != null) {
@@ -439,6 +429,8 @@ public class AltosUI extends JFrame {
                                                AltosTelemetry  t = new AltosTelemetry(line);
                                                state = new AltosState(t, state);
                                                show(state);
+
+                                               /* Make it run in realtime after the rocket leaves the pad */
                                                try {
                                                        if (state.state > AltosTelemetry.ao_flight_pad)
                                                                Thread.sleep((int) (state.time_change * 1000));