projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/stmf0: Have fast ADC ring buffer code use wrap-around
[fw/altos]
/
micropeak
/
MicroPeak.java
diff --git
a/micropeak/MicroPeak.java
b/micropeak/MicroPeak.java
index e6aa9ab027dbd1768d42acd776fce06a0bdf9d3f..9f7095f36248ebd85105cd00dd389c65d9041ad0 100644
(file)
--- 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 java.io.*;
import java.util.concurrent.*;
import java.util.*;
-import org.altusmetrum.altoslib.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.altoslib
_6
.*;
+import org.altusmetrum.altosuilib
_6
.*;
public class MicroPeak extends MicroFrame implements ActionListener, ItemListener {
File filename;
MicroGraph graph;
public class MicroPeak extends MicroFrame implements ActionListener, ItemListener {
File filename;
MicroGraph graph;
- MicroStatsTable stats;
+ AltosUIEnable enable;
+ MicroStatsTable statsTable;
MicroRaw raw;
MicroData data;
MicroRaw raw;
MicroData data;
+ MicroStats stats;
Container container;
JTabbedPane pane;
static int number_of_windows;
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;
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;
raw.setData(data);
setTitle(data.name);
return this;
@@
-61,6
+64,11
@@
public class MicroPeak extends MicroFrame implements ActionListener, ItemListene
FileInputStream fis = new FileInputStream(filename);
try {
data = new MicroData((InputStream) fis, filename.getName());
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 {
} catch (InterruptedException ie) {
data = null;
} finally {
@@
-99,7
+107,7
@@
public class MicroPeak extends MicroFrame implements ActionListener, ItemListene
private void DownloadData() {
AltosDevice device = MicroDeviceDialog.show(this);
private void DownloadData() {
AltosDevice device = MicroDeviceDialog.show(this);
-
+
if (device != null)
new MicroDownload(this, device);
}
if (device != null)
new MicroDownload(this, device);
}
@@
-120,7
+128,7
@@
public class MicroPeak extends MicroFrame implements ActionListener, ItemListene
if (save.runDialog())
SetName(data.name);
}
if (save.runDialog())
SetName(data.name);
}
-
+
private void Export() {
if (data == null) {
no_data();
private void Export() {
if (data == null) {
no_data();
@@
-182,10
+190,25
@@
public class MicroPeak extends MicroFrame implements ActionListener, ItemListene
public void itemStateChanged(ItemEvent e) {
}
public void itemStateChanged(ItemEvent e) {
}
+ /* OSXAdapter interfaces */
+ public void macosx_file_handler(String path) {
+ CommandGraph(new File(path));
+ }
+
+ public void macosx_quit_handler() {
+ System.exit(0);
+ }
+
+ public void macosx_preferences_handler() {
+ Preferences();
+ }
+
public MicroPeak() {
++number_of_windows;
public MicroPeak() {
++number_of_windows;
+ register_for_macosx_events();
+
AltosUIPreferences.set_component(this);
container = getContentPane();
AltosUIPreferences.set_component(this);
container = getContentPane();
@@
-227,20
+250,26
@@
public class MicroPeak extends MicroFrame implements ActionListener, ItemListene
fileMenu.add(exitAction);
exitAction.addActionListener(this);
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) {
setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
addWindowListener(new WindowAdapter() {
@Override
public void windowClosing(WindowEvent e) {
- stats.tell_closing();
+ stats
Table
.tell_closing();
Close();
}
});
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");
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();
JScrollPane scroll = new JScrollPane(raw);
pane.add(scroll, "Raw Data");
pane.doLayout();