X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=micropeak%2FMicroPeak.java;h=eee5bc07a04b0bd4c6711fa0efd4f386c993a01b;hp=871d5cc34658e98d835ac2d6b5a94f730321540a;hb=HEAD;hpb=ab9caa22ea905844a99e08b5f6d3b072f094283e diff --git a/micropeak/MicroPeak.java b/micropeak/MicroPeak.java index 871d5cc3..96fb33ba 100644 --- a/micropeak/MicroPeak.java +++ b/micropeak/MicroPeak.java @@ -3,7 +3,8 @@ * * 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; version 2 of the License. + * 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 @@ -23,21 +24,47 @@ import javax.swing.*; import java.io.*; import java.util.concurrent.*; import java.util.*; -import org.altusmetrum.altoslib_1.*; -import org.altusmetrum.altosuilib_1.*; +import org.altusmetrum.altoslib_14.*; +import org.altusmetrum.altosuilib_14.*; -public class MicroPeak extends MicroFrame implements ActionListener, ItemListener { +public class MicroPeak extends MicroFrame implements ActionListener, ItemListener, AltosFilterListener { File filename; - MicroGraph graph; + AltosGraph graph; AltosUIEnable enable; - MicroStatsTable stats; + AltosFlightStatsTable statsTable; MicroRaw raw; MicroData data; Container container; JTabbedPane pane; + JMenuBar menu_bar; static int number_of_windows; + /* File menu */ + final static String open_command = "open"; + final static String save_command = "save"; + final static String export_command = "export"; + final static String preferences_command = "preferences"; + final static String close_command = "close"; + final static String exit_command = "exit"; + + static final String[][] file_menu_entries = new String[][] { + { "Open", open_command }, + { "Save a Copy", save_command }, + { "Export Data", export_command }, + { "Preferences", preferences_command }, + { "Close", close_command }, + { "Exit", exit_command }, + }; + + /* Download menu */ + final static String download_command = "download"; + final static String download_label = "Download"; + + static final String[][] download_menu_entries = new String[][] { + { download_label, download_command } + }; + MicroPeak SetData(MicroData data) { MicroPeak mp = this; if (this.data != null) { @@ -45,8 +72,12 @@ public class MicroPeak extends MicroFrame implements ActionListener, ItemListene return mp.SetData(data); } this.data = data; - graph.setDataSet(data); - stats.setData(data); + if (data.flight_series == null) + System.out.printf("no data in flight\n"); + if (data.flight_stats == null) + System.out.printf("no stats in flight\n"); + graph.set_data(data.flight_stats, data.flight_series); + statsTable.set_stats(data.flight_stats); raw.setData(data); setTitle(data.name); return this; @@ -62,6 +93,11 @@ public class MicroPeak extends MicroFrame implements ActionListener, ItemListene FileInputStream fis = new FileInputStream(filename); try { data = new MicroData((InputStream) fis, filename.getName()); + AltosUIPreferences.set_last_logdir(filename); + } catch (MicroData.NonHexcharException nhe) { + data = null; + } catch (MicroData.FileEndedException nhe) { + data = null; } catch (InterruptedException ie) { data = null; } finally { @@ -100,9 +136,18 @@ public class MicroPeak extends MicroFrame implements ActionListener, ItemListene private void DownloadData() { AltosDevice device = MicroDeviceDialog.show(this); - - if (device != null) - new MicroDownload(this, device); + MicroSerial serial = null; + try { + serial = new MicroSerial(device); + } catch (FileNotFoundException fe) { + JOptionPane.showMessageDialog(this, + fe.getMessage(), + "Cannot open device", + JOptionPane.ERROR_MESSAGE); + return; + } + + new MicroDownload(this, device, serial); } private void no_data() { @@ -121,7 +166,7 @@ public class MicroPeak extends MicroFrame implements ActionListener, ItemListene if (save.runDialog()) SetName(data.name); } - + private void Export() { if (data == null) { no_data(); @@ -164,86 +209,124 @@ public class MicroPeak extends MicroFrame implements ActionListener, ItemListene } public void actionPerformed(ActionEvent ev) { - if ("Exit".equals(ev.getActionCommand())) - System.exit(0); - else if ("Close".equals(ev.getActionCommand())) - Close(); - else if ("Open".equals(ev.getActionCommand())) + if (open_command.equals(ev.getActionCommand())) SelectFile(); - else if ("Download".equals(ev.getActionCommand())) - DownloadData(); - else if ("Export".equals(ev.getActionCommand())) + else if (save_command.equals(ev.getActionCommand())) + Save(); + else if (export_command.equals(ev.getActionCommand())) Export(); - else if ("Preferences".equals(ev.getActionCommand())) + else if (preferences_command.equals(ev.getActionCommand())) Preferences(); - else if ("Save a Copy".equals(ev.getActionCommand())) - Save(); + else if (close_command.equals(ev.getActionCommand())) + Close(); + else if (exit_command.equals(ev.getActionCommand())) + System.exit(0); + else if (download_command.equals(ev.getActionCommand())) + DownloadData(); } public void itemStateChanged(ItemEvent e) { } - public MicroPeak() { + /* OSXAdapter interfaces */ + public void macosx_file_handler(String path) { + CommandGraph(new File(path)); + } - ++number_of_windows; + public void macosx_quit_handler() { + System.exit(0); + } - AltosUIPreferences.set_component(this); + public void macosx_preferences_handler() { + Preferences(); + } - container = getContentPane(); - pane = new JTabbedPane(); + public void filter_changed(double speed_filter, double accel_filter) { + data.flight_series.set_filter(speed_filter, accel_filter); + graph.filter_changed(); + data.flight_stats = new AltosFlightStats(data.flight_series); + statsTable.filter_changed(data.flight_stats); + } - setTitle("MicroPeak"); + public double speed_filter() { + if (data != null && data.flight_series != null) + return data.flight_series.speed_filter_width; + return 4.0; + } - JMenuBar menuBar = new JMenuBar(); - setJMenuBar(menuBar); + public double accel_filter() { + if (data != null && data.flight_series != null) + return data.flight_series.accel_filter_width; + return 1.0; + } - JMenu fileMenu = new JMenu("File"); - menuBar.add(fileMenu); + private void add_menu(JMenu menu, String label, String action) { + JMenuItem item = new JMenuItem(label); + menu.add(item); + item.addActionListener(this); + item.setActionCommand(action); + } - JMenuItem openAction = new JMenuItem("Open"); - fileMenu.add(openAction); - openAction.addActionListener(this); - JMenuItem downloadAction = new JMenuItem("Download"); - fileMenu.add(downloadAction); - downloadAction.addActionListener(this); + private void make_menu(String label, String[][] items) { + JMenu menu = new JMenu(label); + for (int i = 0; i < items.length; i++) { + if (MAC_OS_X) { + if (items[i][1].equals("exit")) + continue; + if (items[i][1].equals("preferences")) + continue; + } + add_menu(menu, items[i][0], items[i][1]); + } + menu_bar.add(menu); + } - JMenuItem saveAction = new JMenuItem("Save a Copy"); - fileMenu.add(saveAction); - saveAction.addActionListener(this); + public MicroPeak() { - JMenuItem exportAction = new JMenuItem("Export"); - fileMenu.add(exportAction); - exportAction.addActionListener(this); + ++number_of_windows; + + register_for_macosx_events(); - JMenuItem preferencesAction = new JMenuItem("Preferences"); - fileMenu.add(preferencesAction); - preferencesAction.addActionListener(this); + AltosUIPreferences.set_component(this); - JMenuItem closeAction = new JMenuItem("Close"); - fileMenu.add(closeAction); - closeAction.addActionListener(this); + container = getContentPane(); + pane = new JTabbedPane(); - JMenuItem exitAction = new JMenuItem("Exit"); - fileMenu.add(exitAction); - exitAction.addActionListener(this); + setTitle("MicroPeak"); + + menu_bar = new JMenuBar(); + setJMenuBar(menu_bar); + + make_menu("File", file_menu_entries); + + if (MAC_OS_X) { + make_menu(download_label, download_menu_entries); + } else { + JButton download_button = new JButton (download_label); + download_button.setActionCommand(download_command); + download_button.addActionListener(this); + menu_bar.add(download_button); + } setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE); addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent e) { - stats.tell_closing(); + statsTable.tell_closing(); + raw.tell_closing(); Close(); } }); - enable = new AltosUIEnable(); - graph = new MicroGraph(enable); - stats = new MicroStatsTable(); + enable = new AltosUIEnable(this); + + graph = new AltosGraph(enable); + statsTable = new AltosFlightStatsTable(); raw = new MicroRaw(); pane.add(graph.panel, "Graph"); pane.add(enable, "Configure Graph"); - pane.add(stats, "Statistics"); + pane.add(statsTable, "Statistics"); JScrollPane scroll = new JScrollPane(raw); pane.add(scroll, "Raw Data"); pane.doLayout(); @@ -257,8 +340,8 @@ public class MicroPeak extends MicroFrame implements ActionListener, ItemListene Dimension ps = pane.getPreferredSize(); ps.width += i.left + i.right; ps.height += i.top + i.bottom; -// setPreferredSize(ps); setSize(ps); + pack(); setVisible(true); } @@ -297,8 +380,9 @@ public class MicroPeak extends MicroFrame implements ActionListener, ItemListene CommandExport(file); opened = true; } catch (Exception e) { - System.err.printf("Error processing \"%s\": %s\n", - file.getName(), e.getMessage()); + System.err.printf("Error processing \"%s\": %s %s\n", + file.getName(), e.toString(), e.getMessage()); + e.printStackTrace(); } } }