projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Hacks to plug into the new graph stuff
[fw/altos]
/
altosui
/
AltosUI.java
diff --git
a/altosui/AltosUI.java
b/altosui/AltosUI.java
index b0c6d33b843f7630be9b8364b3f787a56a6a1497..7caaa3e9a5107f067b02dc5584b42ab174de8072 100644
(file)
--- a/
altosui/AltosUI.java
+++ b/
altosui/AltosUI.java
@@
-348,7
+348,7
@@
public class AltosUI extends AltosUIFrame {
if (states == null)
return;
try {
if (states == null)
return;
try {
- new AltosGraphUI(states, chooser.file());
+ new AltosGraphUI(states,
new AltosEepromRecordSet(new FileReader(chooser.file())),
chooser.file());
} catch (InterruptedException ie) {
} catch (IOException ie) {
}
} catch (InterruptedException ie) {
} catch (IOException ie) {
}
@@
-367,16
+367,16
@@
public class AltosUI extends AltosUIFrame {
static AltosStateIterable open_logfile(File file) {
try {
static AltosStateIterable open_logfile(File file) {
try {
- FileInputStream in;
-
- in = new FileInputStream(file);
if (file.getName().endsWith("telem"))
if (file.getName().endsWith("telem"))
- return new AltosTelemetryFile(
in
);
+ return new AltosTelemetryFile(
new FileInputStream(file)
);
else
else
- return new AltosEepromFile(
in
);
+ return new AltosEepromFile(
new FileReader(file)
);
} catch (FileNotFoundException fe) {
System.out.printf("%s\n", fe.getMessage());
return null;
} catch (FileNotFoundException fe) {
System.out.printf("%s\n", fe.getMessage());
return null;
+ } catch (IOException ie) {
+ System.out.printf("%s\n", ie.getMessage());
+ return null;
}
}
}
}
@@
-487,7
+487,7
@@
public class AltosUI extends AltosUIFrame {
if (states == null)
return false;
try {
if (states == null)
return false;
try {
- new AltosGraphUI(states, file);
+ new AltosGraphUI(states,
new AltosEepromRecordSet(new FileReader(file)),
file);
return true;
} catch (InterruptedException ie) {
} catch (IOException ie) {
return true;
} catch (InterruptedException ie) {
} catch (IOException ie) {