projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Set default log format to FULL until we learn different
[fw/altos]
/
altosui
/
AltosLanded.java
diff --git
a/altosui/AltosLanded.java
b/altosui/AltosLanded.java
index 50c1ea31fe9e3105b8134fdd8ba1d01404f71084..25d4fcc80ea796ae88c63fabfdd426f90fef3e7d 100644
(file)
--- 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
*
* 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
*
* 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 java.awt.event.*;
import javax.swing.*;
import java.io.*;
-import org.altusmetrum.altoslib_
5
.*;
-import org.altusmetrum.altosuilib_
3
.*;
+import org.altusmetrum.altoslib_
11
.*;
+import org.altusmetrum.altosuilib_
11
.*;
public class AltosLanded extends AltosUIFlightTab implements ActionListener {
public class AltosLanded extends AltosUIFlightTab implements ActionListener {
@@
-124,7
+125,7
@@
public class AltosLanded extends AltosUIFlightTab implements ActionListener {
try {
AltosStateIterable states = null;
if (filename.endsWith("eeprom")) {
try {
AltosStateIterable states = null;
if (filename.endsWith("eeprom")) {
- File
InputStream in = new FileInputStream
(file);
+ File
Reader in = new FileReader
(file);
states = new AltosEepromFile(in);
} else if (filename.endsWith("telem")) {
FileInputStream in = new FileInputStream(file);
states = new AltosEepromFile(in);
} else if (filename.endsWith("telem")) {
FileInputStream in = new FileInputStream(file);
@@
-142,6
+143,11
@@
public class AltosLanded extends AltosUIFlightTab implements ActionListener {
fe.getMessage(),
"Cannot open file",
JOptionPane.ERROR_MESSAGE);
fe.getMessage(),
"Cannot open file",
JOptionPane.ERROR_MESSAGE);
+ } catch (IOException ie) {
+ JOptionPane.showMessageDialog(null,
+ ie.getMessage(),
+ "Error reading file file",
+ JOptionPane.ERROR_MESSAGE);
}
}
}
}
}
}
@@
-151,6
+157,12
@@
public class AltosLanded extends AltosUIFlightTab implements ActionListener {
return "Landed";
}
return "Landed";
}
+ public void show(AltosState state, AltosListenerState listener_state) {
+ super.show(state, listener_state);
+ if (reader.backing_file() != null)
+ graph.setEnabled(true);
+ }
+
public AltosLanded(AltosFlightReader in_reader) {
reader = in_reader;
public AltosLanded(AltosFlightReader in_reader) {
reader = in_reader;