telegps: Hook up data download dialog

[fw/altos] / altosui / AltosDataChooser.java

diff --git a/altosui/AltosDataChooser.java b/altosui/AltosDataChooser.java
index 4d2f321ec454c6ec08c8541fa682cc44b76360ad..43726a44de71e254b1a0020f6263a753cc26752c 100644 (file)
--- a/altosui/AltosDataChooser.java
+++ b/altosui/AltosDataChooser.java
@@ -20,7 +20,8 @@ package altosui;
 import javax.swing.*;
 import javax.swing.filechooser.FileNameExtensionFilter;
 import java.io.*;
-import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;
 
 public class AltosDataChooser extends JFileChooser {
        JFrame  frame;
@@ -35,7 +36,7 @@ public class AltosDataChooser extends JFileChooser {
                return file;
        }
 
-       public AltosRecordIterable runDialog() {
+       public AltosStateIterable runDialog() {
                int     ret;
 
                ret = showOpenDialog(frame);
@@ -47,13 +48,10 @@ public class AltosDataChooser extends JFileChooser {
                        try {
                                if (filename.endsWith("eeprom")) {
                                        FileInputStream in = new FileInputStream(file);
-                                       return new AltosEepromIterable(in);
+                                       return new AltosEepromFile(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);
+                                       return new AltosTelemetryFile(in);
                                } else {
                                        throw new FileNotFoundException();
                                }
@@ -70,8 +68,16 @@ public class AltosDataChooser extends JFileChooser {
        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("TeleMega eeprom file",
+                                                         "mega"));
+               setFileFilter(new FileNameExtensionFilter("EasyMini eeprom file",
+                                                         "mini"));
                setFileFilter(new FileNameExtensionFilter("Flight data file",
-                                                         "telem", "eeprom", "mega"));
+                                                         "telem", "eeprom", "mega", "mini"));
                setCurrentDirectory(AltosUIPreferences.logdir());
        }
 }