X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=micropeak%2FMicroPeak.java;h=290511e72999f6db185a050b554df5e93b78e78f;hb=31fa139578a86821844e3e2efb1a84bdea4f1370;hp=544f3ae00ee7c93b2bff80bca7363d0d01afe896;hpb=9efc57e4052e3c11218973f7666ad18ea5cf2a5a;p=fw%2Faltos

diff --git a/micropeak/MicroPeak.java b/micropeak/MicroPeak.java
index 544f3ae0..290511e7 100644
--- a/micropeak/MicroPeak.java
+++ b/micropeak/MicroPeak.java
@@ -31,6 +31,7 @@ public class MicroPeak extends MicroFrame implements ActionListener, ItemListene
 	File		filename;
 	MicroGraph	graph;
 	MicroStatsTable	stats;
+	MicroRaw	raw;
 	MicroData	data;
 	Container	container;
 	JTabbedPane	pane;
@@ -45,6 +46,7 @@ public class MicroPeak extends MicroFrame implements ActionListener, ItemListene
 		this.data = data;
 		graph.setData(data);
 		stats.setData(data);
+		raw.setData(data);
 		setTitle(data.name);
 		return this;
 	}
@@ -101,12 +103,15 @@ public class MicroPeak extends MicroFrame implements ActionListener, ItemListene
 			new MicroDownload(this, device);
 	}
 
-	private void Save() {
-		if (data == null) {
+	private void no_data() {
 			JOptionPane.showMessageDialog(this,
 						      "No data available",
 						      "No data",
 						      JOptionPane.INFORMATION_MESSAGE);
+	}
+	private void Save() {
+		if (data == null) {
+			no_data();
 			return;
 		}
 		MicroSave	save = new MicroSave (this, data);
@@ -114,6 +119,15 @@ public class MicroPeak extends MicroFrame implements ActionListener, ItemListene
 			SetName(data.name);
 	}
 	
+	private void Export() {
+		if (data == null) {
+			no_data();
+			return;
+		}
+		MicroExport	export = new MicroExport (this, data);
+		export.runDialog();
+	}
+
 	private void Close() {
 		setVisible(false);
 		dispose();
@@ -131,6 +145,8 @@ public class MicroPeak extends MicroFrame implements ActionListener, ItemListene
 			SelectFile();
 		else if ("Download".equals(ev.getActionCommand()))
 			DownloadData();
+		else if ("Export".equals(ev.getActionCommand()))
+			Export();
 		else if ("Preferences".equals(ev.getActionCommand()))
 			Preferences();
 		else if ("Save a Copy".equals(ev.getActionCommand()))
@@ -169,6 +185,10 @@ public class MicroPeak extends MicroFrame implements ActionListener, ItemListene
 		fileMenu.add(saveAction);
 		saveAction.addActionListener(this);
 
+		JMenuItem exportAction = new JMenuItem("Export");
+		fileMenu.add(exportAction);
+		exportAction.addActionListener(this);
+
 		JMenuItem preferencesAction = new JMenuItem("Preferences");
 		fileMenu.add(preferencesAction);
 		preferencesAction.addActionListener(this);
@@ -191,8 +211,10 @@ public class MicroPeak extends MicroFrame implements ActionListener, ItemListene
 
 		graph = new MicroGraph();
 		stats = new MicroStatsTable();
+		raw = new MicroRaw();
 		pane.add(graph.panel, "Graph");
 		pane.add(stats, "Statistics");
+		pane.add(raw, "Raw Data");
 		pane.doLayout();
 		pane.validate();
 		container.add(pane);