projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Find actual landing time when computing stats (trac #23)
[fw/altos]
/
altosui
/
AltosUI.java
diff --git
a/altosui/AltosUI.java
b/altosui/AltosUI.java
index 8799d560767a6d8f532bdc47914e6b228f498121..89f66c0604521bf89e3de6c10d25586345bd2658 100644
(file)
--- a/
altosui/AltosUI.java
+++ b/
altosui/AltosUI.java
@@
-423,17
+423,17
@@
public class AltosUI extends AltosFrame {
}
}
}
}
- static AltosRecordIterable record_iterable
_file(String filenam
e) {
+ static AltosRecordIterable record_iterable
(File fil
e) {
FileInputStream in;
try {
FileInputStream in;
try {
- in = new FileInputStream(file
name
);
+ in = new FileInputStream(file);
} catch (Exception e) {
} catch (Exception e) {
- System.out.printf("Failed to open file '%s'\n", file
name
);
+ System.out.printf("Failed to open file '%s'\n", file);
return null;
}
AltosRecordIterable recs;
AltosReplayReader reader;
return null;
}
AltosRecordIterable recs;
AltosReplayReader reader;
- if (file
name
.endsWith("eeprom")) {
+ if (file
.getName()
.endsWith("eeprom")) {
recs = new AltosEepromIterable(in);
} else {
recs = new AltosTelemetryIterable(in);
recs = new AltosEepromIterable(in);
} else {
recs = new AltosTelemetryIterable(in);
@@
-441,6
+441,10
@@
public class AltosUI extends AltosFrame {
return recs;
}
return recs;
}
+ static AltosRecordIterable record_iterable_file(String filename) {
+ return record_iterable (new File(filename));
+ }
+
static AltosReplayReader replay_file(String filename) {
AltosRecordIterable recs = record_iterable_file(filename);
if (recs == null)
static AltosReplayReader replay_file(String filename) {
AltosRecordIterable recs = record_iterable_file(filename);
if (recs == null)
@@
-466,9
+470,9
@@
public class AltosUI extends AltosFrame {
}
static void process_summary(String filename) {
}
static void process_summary(String filename) {
- AltosRe
playReader reader = replay
_file(filename);
+ AltosRe
cordIterable iterable = record_iterable
_file(filename);
try {
try {
- AltosFlightStats stats = new AltosFlightStats(
reader
);
+ AltosFlightStats stats = new AltosFlightStats(
iterable
);
if (stats.serial > 0)
System.out.printf("Serial: %5d\n", stats.serial);
if (stats.flight > 0)
if (stats.serial > 0)
System.out.printf("Serial: %5d\n", stats.serial);
if (stats.flight > 0)