projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Execute self-test on MMA655X part
[fw/altos]
/
altosui
/
AltosDataChooser.java
diff --git
a/altosui/AltosDataChooser.java
b/altosui/AltosDataChooser.java
index 7de18afba43a871a7b73cdc6d77c396d546b73a6..a9344a01c832ed0c96b52918a4feb056cb4e1d0d 100644
(file)
--- a/
altosui/AltosDataChooser.java
+++ b/
altosui/AltosDataChooser.java
@@
-20,7
+20,7
@@
package altosui;
import javax.swing.*;
import javax.swing.filechooser.FileNameExtensionFilter;
import java.io.*;
import javax.swing.*;
import javax.swing.filechooser.FileNameExtensionFilter;
import java.io.*;
-import org.altusmetrum.altoslib_
1
.*;
+import org.altusmetrum.altoslib_
3
.*;
import org.altusmetrum.altosuilib_1.*;
public class AltosDataChooser extends JFileChooser {
import org.altusmetrum.altosuilib_1.*;
public class AltosDataChooser extends JFileChooser {
@@
-36,7
+36,7
@@
public class AltosDataChooser extends JFileChooser {
return file;
}
return file;
}
- public Altos
Record
Iterable runDialog() {
+ public Altos
State
Iterable runDialog() {
int ret;
ret = showOpenDialog(frame);
int ret;
ret = showOpenDialog(frame);
@@
-48,13
+48,10
@@
public class AltosDataChooser extends JFileChooser {
try {
if (filename.endsWith("eeprom")) {
FileInputStream in = new FileInputStream(file);
try {
if (filename.endsWith("eeprom")) {
FileInputStream in = new FileInputStream(file);
- return new AltosEeprom
Iterab
le(in);
+ return new AltosEeprom
Fi
le(in);
} else if (filename.endsWith("telem")) {
FileInputStream in = new FileInputStream(file);
} else if (filename.endsWith("telem")) {
FileInputStream in = new FileInputStream(file);
- return new AltosTelemetryIterable(in);
- } else if (filename.endsWith("mega")) {
- FileInputStream in = new FileInputStream(file);
- return new AltosEepromMegaIterable(in);
+ return new AltosTelemetryFile(in);
} else {
throw new FileNotFoundException();
}
} else {
throw new FileNotFoundException();
}
@@
-75,10
+72,12
@@
public class AltosDataChooser extends JFileChooser {
"eeprom"));
setFileFilter(new FileNameExtensionFilter("Telemetry file",
"telem"));
"eeprom"));
setFileFilter(new FileNameExtensionFilter("Telemetry file",
"telem"));
- setFileFilter(new FileNameExtensionFilter("
MegaMetrum
eeprom file",
+ setFileFilter(new FileNameExtensionFilter("
TeleMega
eeprom file",
"mega"));
"mega"));
+ setFileFilter(new FileNameExtensionFilter("EasyMini eeprom file",
+ "mini"));
setFileFilter(new FileNameExtensionFilter("Flight data file",
setFileFilter(new FileNameExtensionFilter("Flight data file",
- "telem", "eeprom", "mega"));
+ "telem", "eeprom", "mega"
, "mini"
));
setCurrentDirectory(AltosUIPreferences.logdir());
}
}
setCurrentDirectory(AltosUIPreferences.logdir());
}
}