projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Expose ao_gps_set_rate from u-blox driver
[fw/altos]
/
micropeak
/
MicroPeak.java
diff --git
a/micropeak/MicroPeak.java
b/micropeak/MicroPeak.java
index 871d5cc34658e98d835ac2d6b5a94f730321540a..78bc857ec2818746a3fc9f05a5b5d97556286ce0 100644
(file)
--- a/
micropeak/MicroPeak.java
+++ b/
micropeak/MicroPeak.java
@@
-23,7
+23,7
@@
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_
1
.*;
+import org.altusmetrum.altoslib_
3
.*;
import org.altusmetrum.altosuilib_1.*;
public class MicroPeak extends MicroFrame implements ActionListener, ItemListener {
import org.altusmetrum.altosuilib_1.*;
public class MicroPeak extends MicroFrame implements ActionListener, ItemListener {
@@
-31,9
+31,10
@@
public class MicroPeak extends MicroFrame implements ActionListener, ItemListene
File filename;
MicroGraph graph;
AltosUIEnable enable;
File filename;
MicroGraph graph;
AltosUIEnable enable;
- MicroStatsTable stats;
+ MicroStatsTable stats
Table
;
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;
@@
-45,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;
+ stats = new MicroStats(data);
graph.setDataSet(data);
graph.setDataSet(data);
- stats
.setData(data
);
+ stats
Table.setStats(stats
);
raw.setData(data);
setTitle(data.name);
return this;
raw.setData(data);
setTitle(data.name);
return this;
@@
-62,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 {
@@
-228,22
+235,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();
}
});
enable = new AltosUIEnable();
graph = new MicroGraph(enable);
Close();
}
});
enable = new AltosUIEnable();
graph = new MicroGraph(enable);
- stats = new MicroStatsTable();
+ stats
Table
= new MicroStatsTable();
raw = new MicroRaw();
pane.add(graph.panel, "Graph");
pane.add(enable, "Configure Graph");
raw = new MicroRaw();
pane.add(graph.panel, "Graph");
pane.add(enable, "Configure Graph");
- pane.add(stats, "Statistics");
+ pane.add(stats
Table
, "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();