Merge branch 'master' of git://git.gag.com/fw/altos
authorAnthony Towns <aj@erisian.com.au>
Fri, 24 Sep 2010 00:28:06 +0000 (10:28 +1000)
committerAnthony Towns <aj@erisian.com.au>
Fri, 24 Sep 2010 00:28:06 +0000 (10:28 +1000)
1  2 
ao-tools/altosui/AltosUI.java
ao-tools/altosui/Makefile.am

index ad02f2ef990149ae21325a99699418fe84cf2745,1adeeccfee47ae35ce9c2256ba49654356adc427..e130de58d703470f61845d3852ccc9b89389370b
@@@ -38,31 -38,25 +38,25 @@@ import altosui.AltosDeviceDialog
  import altosui.AltosPreferences;
  import altosui.AltosLog;
  import altosui.AltosVoice;
- import altosui.AltosFlightStatusTableModel;
  import altosui.AltosFlightInfoTableModel;
  import altosui.AltosChannelMenu;
  import altosui.AltosFlashUI;
  import altosui.AltosLogfileChooser;
  import altosui.AltosCSVUI;
  import altosui.AltosLine;
+ import altosui.AltosStatusTable;
+ import altosui.AltosInfoTable;
  
  import libaltosJNI.*;
  
  public class AltosUI extends JFrame {
        private int channel = -1;
  
-       private AltosFlightStatusTableModel flightStatusModel;
-       private JTable flightStatus;
-       static final int info_columns = 3;
-       private AltosFlightInfoTableModel[] flightInfoModel;
-       private JTable[] flightInfo;
+       private AltosStatusTable flightStatus;
+       private AltosInfoTable flightInfo;
        private AltosSerial serial_line;
        private AltosLog altos_log;
-       private Box[] ibox;
        private Box vbox;
-       private Box hbox;
  
        private Font statusFont = new Font("SansSerif", Font.BOLD, 24);
        private Font infoLabelFont = new Font("SansSerif", Font.PLAIN, 14);
                vbox = Box.createVerticalBox();
                this.add(vbox);
  
-               flightStatusModel = new AltosFlightStatusTableModel();
-               flightStatus = new JTable(flightStatusModel);
-               flightStatus.setFont(statusFont);
-               TableColumnModel tcm = flightStatus.getColumnModel();
-               for (int i = 0; i < flightStatusModel.getColumnCount(); i++) {
-                       DefaultTableCellRenderer       r = new DefaultTableCellRenderer();
-                       r.setFont(statusFont);
-                       r.setHorizontalAlignment(SwingConstants.CENTER);
-                       tcm.getColumn(i).setCellRenderer(r);
-               }
-               FontMetrics     statusMetrics = flightStatus.getFontMetrics(statusFont);
-               int statusHeight = (statusMetrics.getHeight() + statusMetrics.getLeading()) * 15 / 10;
-               flightStatus.setRowHeight(statusHeight);
-               flightStatus.setShowGrid(false);
+               flightStatus = new AltosStatusTable(this);
  
                vbox.add(flightStatus);
  
-               hbox = Box.createHorizontalBox();
-               vbox.add(hbox);
-               flightInfo = new JTable[3];
-               flightInfoModel = new AltosFlightInfoTableModel[3];
-               ibox = new Box[3];
-               FontMetrics     infoValueMetrics = flightStatus.getFontMetrics(infoValueFont);
-               int infoHeight = (infoValueMetrics.getHeight() + infoValueMetrics.getLeading()) * 20 / 10;
-               for (int i = 0; i < info_columns; i++) {
-                       ibox[i] = Box.createVerticalBox();
-                       flightInfoModel[i] = new AltosFlightInfoTableModel();
-                       flightInfo[i] = new JTable(flightInfoModel[i]);
-                       flightInfo[i].setFont(infoValueFont);
-                       flightInfo[i].setRowHeight(infoHeight);
-                       flightInfo[i].setShowGrid(true);
-                       ibox[i].add(flightInfo[i].getTableHeader());
-                       ibox[i].add(flightInfo[i]);
-                       hbox.add(ibox[i]);
-               }
+               flightInfo = new AltosInfoTable();
+               vbox.add(flightInfo.box());
  
                setTitle("AltOS");
  
                serial_line = new AltosSerial();
                altos_log = new AltosLog(serial_line);
                int dpi = Toolkit.getDefaultToolkit().getScreenResolution();
-               this.setSize(new Dimension (infoValueMetrics.charWidth('0') * 6 * 20,
-                                           statusHeight * 4 + infoHeight * 17));
+               this.setSize(new Dimension (flightInfo.width(),
+                                           flightStatus.height() + flightInfo.height()));
                this.validate();
                setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
                addWindowListener(new WindowAdapter() {
                voice.speak("Rocket flight monitor ready.");
        }
  
-       public void info_reset() {
-               for (int i = 0; i < info_columns; i++)
-                       flightInfoModel[i].resetRow();
-       }
-       public void info_add_row(int col, String name, String value) {
-               flightInfoModel[col].addRow(name, value);
-       }
-       public void info_add_row(int col, String name, String format, Object... parameters) {
-               flightInfoModel[col].addRow(name, String.format(format, parameters));
-       }
-       public void info_add_deg(int col, String name, double v, int pos, int neg) {
-               int     c = pos;
-               if (v < 0) {
-                       c = neg;
-                       v = -v;
+       void show(AltosState state, int crc_errors) {
+               if (state != null) {
+                       flightStatus.set(state);
+                       flightInfo.show(state, crc_errors);
                }
-               double  deg = Math.floor(v);
-               double  min = (v - deg) * 60;
-               flightInfoModel[col].addRow(name, String.format("%3.0f°%08.5f'", deg, min));
-       }
-       public void info_finish() {
-               for (int i = 0; i < info_columns; i++)
-                       flightInfoModel[i].finish();
-       }
-       public void show(AltosState state, int crc_errors) {
-               if (state == null)
-                       return;
-               flightStatusModel.set(state);
-               info_reset();
-               info_add_row(0, "Rocket state", "%s", state.data.state());
-               info_add_row(0, "Callsign", "%s", state.data.callsign);
-               info_add_row(0, "Rocket serial", "%6d", state.data.serial);
-               info_add_row(0, "Rocket flight", "%6d", state.data.flight);
-               info_add_row(0, "RSSI", "%6d    dBm", state.data.rssi);
-               info_add_row(0, "CRC Errors", "%6d", crc_errors);
-               info_add_row(0, "Height", "%6.0f    m", state.height);
-               info_add_row(0, "Max height", "%6.0f    m", state.max_height);
-               info_add_row(0, "Acceleration", "%8.1f  m/s²", state.acceleration);
-               info_add_row(0, "Max acceleration", "%8.1f  m/s²", state.max_acceleration);
-               info_add_row(0, "Speed", "%8.1f  m/s", state.ascent ? state.speed : state.baro_speed);
-               info_add_row(0, "Max Speed", "%8.1f  m/s", state.max_speed);
-               info_add_row(0, "Temperature", "%9.2f °C", state.temperature);
-               info_add_row(0, "Battery", "%9.2f V", state.battery);
-               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, "GPS", "not available");
-               } else {
-                       if (state.gps_ready)
-                               info_add_row(1, "GPS state", "%s", "ready");
-                       else
-                               info_add_row(1, "GPS state", "wait (%d)",
-                                            state.gps_waiting);
-                       if (state.data.gps.locked)
-                               info_add_row(1, "GPS", "   locked");
-                       else if (state.data.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", "%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", "%6d m",
-                                                    (int) (state.from_pad.distance + 0.5));
-                                       info_add_row(1, "Direction from pad", "%6d°",
-                                                    (int) (state.from_pad.bearing + 0.5));
-                                       info_add_row(1, "Elevation from pad", "%6d°",
-                                                    (int) (state.elevation + 0.5));
-                                       info_add_row(1, "Range from pad", "%6d m",
-                                                    (int) (state.range + 0.5));
-                               } else {
-                                       info_add_row(1, "Distance from pad", "unknown");
-                                       info_add_row(1, "Direction from pad", "unknown");
-                                       info_add_row(1, "Elevation from pad", "unknown");
-                                       info_add_row(1, "Range 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.year,
-                                      state.gps.month,
-                                      state.gps.day);
-                       info_add_row(1, "GPS time", "  %02d:%02d:%02d",
-                                      state.gps.hour,
-                                      state.gps.minute,
-                                      state.gps.second);
-                       int     nsat_vis = 0;
-                       int     c;
-                       if (state.gps.cc_gps_sat == null)
-                               info_add_row(2, "Satellites Visible", "%4d", 0);
-                       else {
-                               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",
-                                                    "%4d, %4d",
-                                                    state.gps.cc_gps_sat[c].svid,
-                                                    state.gps.cc_gps_sat[c].c_n0);
-                               }
-                       }
-               }
-               info_finish();
        }
  
        class IdleThread extends Thread {
  
                        idle_thread = new IdleThread();
  
-                       info_reset();
-                       info_finish();
+                       flightInfo.clear();
                        try {
                                for (;;) {
                                        try {
                }
        }
  
-       class ReplayTelemetryThread extends ReplayThread {
-               ReplayTelemetryThread(FileInputStream in, String in_name) {
-                       super(new AltosTelemetryReader(in), in_name);
-               }
-       }
-       class ReplayEepromThread extends ReplayThread {
-               ReplayEepromThread(FileInputStream in, String in_name) {
-                       super(new AltosEepromReader(in), in_name);
-               }
-       }
        Thread          display_thread;
  
        private void stop_display() {
                new AltosCSVUI(AltosUI.this);
        }
  
 +      /* Load a flight log CSV file and display a pretty graph.
 +       */
 +
 +      private void GraphData() {
 +              new AltosGraphUI(AltosUI.this);
 +      }
 +
        /* Create the AltosUI menus
         */
        private void createMenu() {
                                });
                        menu.add(item);
  
 +                      item = new JMenuItem("Graph Data",KeyEvent.VK_F);
 +                      item.addActionListener(new ActionListener() {
 +                                      public void actionPerformed(ActionEvent e) {
 +                                              GraphData();
 +                                      }
 +                              });
 +                      menu.add(item);
 +
                        item = new JMenuItem("Quit",KeyEvent.VK_Q);
                        item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_Q,
                                                                   ActionEvent.CTRL_MASK));
                        altosui.setVisible(true);
                }
        }
 -}
 +}
index 0a91f939db0a51fe6f4828c5dfa23473e069ab98,56ac0520e2240020f9f24adcdfff3a1df0a8e0da..35a1b99035665f21d3de454270a89cb5f8f7ebd1
@@@ -5,7 -5,7 +5,7 @@@ man_MANS=altosui.
  
  altoslibdir=$(libdir)/altos
  
 -CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../libaltos:$(FREETTS)/*:/usr/share/java/*"
 +CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../libaltos:$(JFREECHART)/*:$(FREETTS)/*:/usr/share/java/*"
  
  bin_SCRIPTS=altosui
  
@@@ -33,6 -33,7 +33,7 @@@ altosui_JAVA = 
        AltosGreatCircle.java \
        AltosHexfile.java \
        Altos.java \
+       AltosInfoTable.java \
        AltosLine.java \
        AltosLogfileChooser.java \
        AltosLog.java \
        AltosSerial.java \
        AltosSerialMonitor.java \
        AltosState.java \
+       AltosStatusTable.java \
        AltosTelemetry.java \
        AltosTelemetryReader.java \
        AltosUI.java \
 +    AltosCsvReader.java \
 +    AltosDataPoint.java \
 +    AltosGraph.java \
 +    AltosGraphTime.java \
 +    AltosGraphUI.java \
 +    AltosGraphDataChooser.java \
        AltosVoice.java
  
 +JFREECHART_CLASS= \
 +    jfreechart.jar \
 +    jcommon.jar \
 +    csv.jar
 +
  FREETTS_CLASS= \
        cmudict04.jar \
        cmulex.jar \
@@@ -93,7 -84,7 +95,7 @@@ LINUX_DIST=Altos-Linux-$(VERSION).tar.b
  MACOSX_DIST=Altos-Mac-$(VERSION).zip
  WINDOWS_DIST=Altos-Windows-$(VERSION_DASH).exe
  
 -FAT_FILES=$(FATJAR) $(FREETTS_CLASS)
 +FAT_FILES=$(FATJAR) $(FREETTS_CLASS) $(JFREECHART_CLASS)
  
  LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE)
  LINUX_EXTRA=altosui-fat
@@@ -108,11 -99,9 +110,9 @@@ all-local: classes/altosui $(JAR) altos
  clean-local:
        -rm -rf classes $(JAR) $(FATJAR) \
                $(LINUX_DIST) $(MACOSX_DIST) windows $(WINDOWS_DIST) $(FREETTS_CLASS) \
 -              $(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log \
 +              $(JFREECHART_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log \
                altosui altosui-test macosx linux
  
- fat: $(FATJAR) $(LINUX_DIST) $(MACOSX_DIST) $(WINDOWS_DIST)
  if FATINSTALL
  
  FATTARGET=$(FATDIR)/$(VERSION)
@@@ -135,8 -124,11 +135,11 @@@ $(WINDOWS_DIST_TARGET): $(WINDOWS_DIST
        mkdir -p $(FATTARGET)
        cp -p $< $@
  
+ else
+ fat: $(LINUX_DIST) $(MACOSX_DIST) $(WINDOWS_DIST)
  endif
  
  altosuidir=$(datadir)/java
  
  install-altosuiJAVA: altosui.jar
@@@ -154,7 -146,7 +157,7 @@@ $(JAR): classaltosui.stamp Manifest.tx
                -C classes altosui \
                -C ../libaltos libaltosJNI
  
 -$(FATJAR): classaltosui.stamp Manifest-fat.txt $(FREETTS_CLASS) $(LIBALTOS) $(JAVA_ICON)
 +$(FATJAR): classaltosui.stamp Manifest-fat.txt $(FREETTS_CLASS) $(JFREECHART_CLASS) $(LIBALTOS) $(JAVA_ICON)
        jar cfm $@ Manifest-fat.txt \
                -C $(top_srcdir)/icon altus-metrum-16x16.jpg \
                -C classes altosui \
  
  Manifest.txt: Makefile
        echo 'Main-Class: altosui.AltosUI' > $@
 -      echo "Class-Path: $(FREETTS)/freetts.jar" >> $@
 +      echo "Class-Path: $(FREETTS)/freetts.jar $(JFREECHART)/jfreechart.jar $(JFREECHAR)/jcommon.jar $(JFREECHART)/csv.jar" >> $@
  
  Manifest-fat.txt:
        echo 'Main-Class: altosui.AltosUI' > $@
 -      echo "Class-Path: freetts.jar" >> $@
 +      echo "Class-Path: freetts.jar jfreechart.jar jcommon.jar csv.jar" >> $@
  
  altosui: Makefile
        echo "#!/bin/sh" > $@