X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosLanded.java;h=95cab6051422e1eed05d4652194d6afc28499d30;hp=423e0e231f7068a67372576b5a47558ff75f84f3;hb=bbe0c2e0a3216f40f49af34b756330ba28d7c7e1;hpb=7041c386cdf37716f8daf0bc1a9204db620e3de9

diff --git a/altosui/AltosLanded.java b/altosui/AltosLanded.java
index 423e0e23..95cab605 100644
--- a/altosui/AltosLanded.java
+++ b/altosui/AltosLanded.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,8 +22,8 @@ import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import java.io.*;
-import org.altusmetrum.altoslib_9.*;
-import org.altusmetrum.altosuilib_9.*;
+import org.altusmetrum.altoslib_11.*;
+import org.altusmetrum.altosuilib_11.*;
 
 public class AltosLanded extends AltosUIFlightTab implements ActionListener {
 
@@ -123,9 +124,11 @@ public class AltosLanded extends AltosUIFlightTab implements ActionListener {
 				String	filename = file.getName();
 				try {
 					AltosStateIterable states = null;
+					AltosRecordSet record_set = null;
 					if (filename.endsWith("eeprom")) {
-						FileInputStream in = new FileInputStream(file);
+						FileReader in = new FileReader(file);
 						states = new AltosEepromFile(in);
+						record_set = new AltosEepromRecordSet(new FileReader(file));
 					} else if (filename.endsWith("telem")) {
 						FileInputStream in = new FileInputStream(file);
 						states = new AltosTelemetryFile(in);
@@ -133,7 +136,7 @@ public class AltosLanded extends AltosUIFlightTab implements ActionListener {
 						throw new FileNotFoundException(filename);
 					}
 					try {
-						new AltosGraphUI(states, file);
+						new AltosGraphUI(states, record_set, file);
 					} catch (InterruptedException ie) {
 					} catch (IOException ie) {
 					}
@@ -142,6 +145,11 @@ public class AltosLanded extends AltosUIFlightTab implements ActionListener {
 								      fe.getMessage(),
 								      "Cannot open file",
 								      JOptionPane.ERROR_MESSAGE);
+				} catch (IOException ie) {
+					JOptionPane.showMessageDialog(null,
+								      ie.getMessage(),
+								      "Error reading file file",
+								      JOptionPane.ERROR_MESSAGE);
 				}
 			}
 		}