projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Complete split out of separate java library
[fw/altos]
/
altosui
/
AltosDataPointReader.java
diff --git
a/altosui/AltosDataPointReader.java
b/altosui/AltosDataPointReader.java
index fa48013f3b1053a65678ee02f6535aa834cb5035..821b0771b7f7101ee200dd358822b34958020a3c 100644
(file)
--- a/
altosui/AltosDataPointReader.java
+++ b/
altosui/AltosDataPointReader.java
@@
-9,6
+9,7
@@
import java.text.ParseException;
import java.lang.UnsupportedOperationException;
import java.util.NoSuchElementException;
import java.util.Iterator;
import java.lang.UnsupportedOperationException;
import java.util.NoSuchElementException;
import java.util.Iterator;
+import org.altusmetrum.AltosLib.*;
class AltosDataPointReader implements Iterable<AltosDataPoint> {
Iterator<AltosRecord> iter;
class AltosDataPointReader implements Iterable<AltosDataPoint> {
Iterator<AltosRecord> iter;
@@
-69,10
+70,14
@@
class AltosDataPointReader implements Iterable<AltosDataPoint> {
throw new UnsupportedOperationException();
}
public boolean hasNext() {
throw new UnsupportedOperationException();
}
public boolean hasNext() {
+ if (record != null && record.state == Altos.ao_flight_landed)
+ return false;
return iter.hasNext();
}
public AltosDataPoint next() {
return iter.hasNext();
}
public AltosDataPoint next() {
- read_next_record();
+ do {
+ read_next_record();
+ } while (record.time < -1.0 && hasNext());
return current_dp();
}
};
return current_dp();
}
};