X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=micropeak%2FMicroPeak.java;h=871d5cc34658e98d835ac2d6b5a94f730321540a;hb=518b16f64f4be096ceff13ab31b96d6909fe3ae2;hp=5d128dfd9cfaad218bc00362d53868e9b67e2bd1;hpb=670034eef48d63cdaec8d271fa93da984ffe2ea9;p=fw%2Faltos diff --git a/micropeak/MicroPeak.java b/micropeak/MicroPeak.java index 5d128dfd..871d5cc3 100644 --- a/micropeak/MicroPeak.java +++ b/micropeak/MicroPeak.java @@ -23,13 +23,14 @@ import javax.swing.*; import java.io.*; import java.util.concurrent.*; import java.util.*; -import org.altusmetrum.AltosLib.*; -import org.altusmetrum.altosuilib.*; +import org.altusmetrum.altoslib_1.*; +import org.altusmetrum.altosuilib_1.*; public class MicroPeak extends MicroFrame implements ActionListener, ItemListener { File filename; MicroGraph graph; + AltosUIEnable enable; MicroStatsTable stats; MicroRaw raw; MicroData data; @@ -44,7 +45,7 @@ public class MicroPeak extends MicroFrame implements ActionListener, ItemListene return mp.SetData(data); } this.data = data; - graph.setData(data); + graph.setDataSet(data); stats.setData(data); raw.setData(data); setTitle(data.name); @@ -231,14 +232,17 @@ public class MicroPeak extends MicroFrame implements ActionListener, ItemListene addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent e) { + stats.tell_closing(); Close(); } }); - graph = new MicroGraph(); + enable = new AltosUIEnable(); + graph = new MicroGraph(enable); stats = new MicroStatsTable(); raw = new MicroRaw(); pane.add(graph.panel, "Graph"); + pane.add(enable, "Configure Graph"); pane.add(stats, "Statistics"); JScrollPane scroll = new JScrollPane(raw); pane.add(scroll, "Raw Data"); @@ -255,7 +259,6 @@ public class MicroPeak extends MicroFrame implements ActionListener, ItemListene ps.height += i.top + i.bottom; // setPreferredSize(ps); setSize(ps); - setLocationByPlatform(true); setVisible(true); }