X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=micropeak%2FMicroPeak.java;h=cb1c68cbba2eb7afbc55fe3580a0ff5bce1f5d2f;hp=63387ed1fc0f26d60999e2954ebcdbe35df645cd;hb=7ec1b97d278c7aec3199fb7270f0dcf9484c879f;hpb=8d1d8d2a3c129cdbd55427bcda0f26715b02f1ee diff --git a/micropeak/MicroPeak.java b/micropeak/MicroPeak.java index 63387ed1..cb1c68cb 100644 --- a/micropeak/MicroPeak.java +++ b/micropeak/MicroPeak.java @@ -30,9 +30,11 @@ public class MicroPeak extends MicroFrame implements ActionListener, ItemListene File filename; MicroGraph graph; - MicroStatsTable stats; + AltosUIEnable enable; + MicroStatsTable statsTable; MicroRaw raw; MicroData data; + MicroStats stats; Container container; JTabbedPane pane; static int number_of_windows; @@ -44,8 +46,9 @@ public class MicroPeak extends MicroFrame implements ActionListener, ItemListene return mp.SetData(data); } this.data = data; - graph.setData(data); - stats.setData(data); + stats = new MicroStats(data); + graph.setDataSet(data); + statsTable.setStats(stats); raw.setData(data); setTitle(data.name); return this; @@ -61,6 +64,7 @@ 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 (InterruptedException ie) { data = null; } finally { @@ -227,20 +231,26 @@ public class MicroPeak extends MicroFrame implements ActionListener, ItemListene fileMenu.add(exitAction); exitAction.addActionListener(this); + JButton downloadButton = new JButton ("Download"); + downloadButton.addActionListener(this); + menuBar.add(downloadButton); + setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE); addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent e) { - stats.tell_closing(); + statsTable.tell_closing(); Close(); } }); - graph = new MicroGraph(); - stats = new MicroStatsTable(); + enable = new AltosUIEnable(); + graph = new MicroGraph(enable); + statsTable = new MicroStatsTable(); raw = new MicroRaw(); pane.add(graph.panel, "Graph"); - pane.add(stats, "Statistics"); + pane.add(enable, "Configure Graph"); + pane.add(statsTable, "Statistics"); JScrollPane scroll = new JScrollPane(raw); pane.add(scroll, "Raw Data"); pane.doLayout();