projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set telegps USB id to 0025
[fw/altos]
/
altosui
/
AltosDataChooser.java
diff --git
a/altosui/AltosDataChooser.java
b/altosui/AltosDataChooser.java
index d81ca6d1a128aa009c7420e0f9a67f96901ae4f4..7de18afba43a871a7b73cdc6d77c396d546b73a6 100644
(file)
--- a/
altosui/AltosDataChooser.java
+++ b/
altosui/AltosDataChooser.java
@@
-17,15
+17,11
@@
package altosui;
package altosui;
-import java.awt.*;
-import java.awt.event.*;
import javax.swing.*;
import javax.swing.filechooser.FileNameExtensionFilter;
import javax.swing.*;
import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
import java.io.*;
import java.io.*;
-import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
+import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altosuilib_1.*;
public class AltosDataChooser extends JFileChooser {
JFrame frame;
public class AltosDataChooser extends JFileChooser {
JFrame frame;
@@
-56,6
+52,9
@@
public class AltosDataChooser extends JFileChooser {
} else if (filename.endsWith("telem")) {
FileInputStream in = new FileInputStream(file);
return new AltosTelemetryIterable(in);
} 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);
} else {
throw new FileNotFoundException();
}
} else {
throw new FileNotFoundException();
}
@@
-72,8
+71,14
@@
public class AltosDataChooser extends JFileChooser {
public AltosDataChooser(JFrame in_frame) {
frame = in_frame;
setDialogTitle("Select Flight Record File");
public AltosDataChooser(JFrame in_frame) {
frame = in_frame;
setDialogTitle("Select Flight Record File");
+ setFileFilter(new FileNameExtensionFilter("TeleMetrum eeprom file",
+ "eeprom"));
+ setFileFilter(new FileNameExtensionFilter("Telemetry file",
+ "telem"));
+ setFileFilter(new FileNameExtensionFilter("MegaMetrum eeprom file",
+ "mega"));
setFileFilter(new FileNameExtensionFilter("Flight data file",
setFileFilter(new FileNameExtensionFilter("Flight data file",
- "telem", "eeprom"));
- setCurrentDirectory(AltosPreferences.logdir());
+ "telem", "eeprom"
, "mega"
));
+ setCurrentDirectory(Altos
UI
Preferences.logdir());
}
}
}
}