Remove unused cell renderer class

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

diff --git a/ao-tools/altosui/AltosUI.java b/ao-tools/altosui/AltosUI.java
index 2cf326fc19ef36ebe861c9de481cebdc4d705eb4..8880618b251b3c2b4daa68a6673caa474721d950 100644 (file)
--- a/ao-tools/altosui/AltosUI.java
+++ b/ao-tools/altosui/AltosUI.java
@@ -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"};
 
@@ -306,14 +286,19 @@ public class AltosUI extends JFrame {
                        info_add_deg(1, "Longitude", state.gps.lon, 'E', 'W');
                        info_add_row(1, "GPS altitude", "%6d", state.gps.alt);
                        info_add_row(1, "GPS height", "%6.0f", state.gps_height);
-                       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);
+
+                       /* 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);
-                       info_add_row(1, "GPS error", "%6d m(h)%3d m(v)",
-                                    state.gps.h_error, state.gps.v_error);
+
                        if (state.npad > 0) {
                                if (state.from_pad != null) {
                                        info_add_row(1, "Distance from pad", "%6.0f m", state.from_pad.distance);
@@ -324,7 +309,7 @@ public class AltosUI extends JFrame {
                                }
                                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", "%9.2fm", state.pad_alt);
+                               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,
@@ -432,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) {
@@ -441,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));