X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=micropeak%2FMicroPeak.java;h=792231768808a04011246d2561c29b637bffb8ef;hp=185fa67eff9bf196db6f227f78360780a2ef9bf9;hb=09d5d6f546ccef2bfd4941e590f047485bb73d76;hpb=f20781010a6560b7b359af269c502d098917c446

diff --git a/micropeak/MicroPeak.java b/micropeak/MicroPeak.java
index 185fa67e..79223176 100644
--- a/micropeak/MicroPeak.java
+++ b/micropeak/MicroPeak.java
@@ -23,16 +23,18 @@ 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;
-	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 {
@@ -231,15 +235,18 @@ public class MicroPeak extends MicroFrame implements ActionListener, ItemListene
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent e) {
+				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();
@@ -255,7 +262,6 @@ public class MicroPeak extends MicroFrame implements ActionListener, ItemListene
 		ps.height += i.top + i.bottom;
 //		setPreferredSize(ps);
 		setSize(ps);
-		setLocationByPlatform(true);
 		setVisible(true);
 	}
 
@@ -277,7 +283,6 @@ public class MicroPeak extends MicroFrame implements ActionListener, ItemListene
 		}
 
 		for (int i = 0; i < args.length; i++) {
-			System.out.printf ("Arg %d: %s\n", i, args[i]);
 			if (args[i].equals("--help"))
 				help(0);
 			else if (args[i].equals("--export"))