projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Clean up trailing whitespace in ao_pad.c
[fw/altos]
/
altosui
/
AltosGraphDataSet.java
diff --git
a/altosui/AltosGraphDataSet.java
b/altosui/AltosGraphDataSet.java
index 092b7c74418e504b6202f337a72bc163fa6bb442..d2773a3f8558c285436c02ad44e2e35d48ad76ba 100644
(file)
--- a/
altosui/AltosGraphDataSet.java
+++ b/
altosui/AltosGraphDataSet.java
@@
-20,37
+20,36
@@
package altosui;
import java.lang.*;
import java.io.*;
import java.util.*;
import java.lang.*;
import java.io.*;
import java.util.*;
-import org.altusmetrum.altoslib_
1
.*;
+import org.altusmetrum.altoslib_
3
.*;
import org.altusmetrum.altosuilib_1.*;
class AltosGraphIterator implements Iterator<AltosUIDataPoint> {
AltosGraphDataSet dataSet;
import org.altusmetrum.altosuilib_1.*;
class AltosGraphIterator implements Iterator<AltosUIDataPoint> {
AltosGraphDataSet dataSet;
- Iterator<AltosRecord> iterator;
-
- AltosState state;
+ Iterator<AltosState> iterator;
public boolean hasNext() {
return iterator.hasNext();
}
public AltosUIDataPoint next() {
public boolean hasNext() {
return iterator.hasNext();
}
public AltosUIDataPoint next() {
-
state = new AltosState(iterator.next(), state
);
+
AltosState state = iterator.next(
);
- if (dataSet.callsign == null && state.data.callsign != null)
- dataSet.callsign = state.data.callsign;
+ if (state.flight != AltosLib.MISSING) {
+ if (dataSet.callsign == null && state.callsign != null)
+ dataSet.callsign = state.callsign;
-
if (dataSet.serial == 0 && state.data
.serial != 0)
-
dataSet.serial = state.data
.serial;
+
if (dataSet.serial == 0 && state
.serial != 0)
+
dataSet.serial = state
.serial;
- if (dataSet.flight == 0 && state.data.flight != 0)
- dataSet.flight = state.data.flight;
+ if (dataSet.flight == 0 && state.flight != 0)
+ dataSet.flight = state.flight;
+ }
return new AltosGraphDataPoint(state);
}
return new AltosGraphDataPoint(state);
}
- public AltosGraphIterator (Iterator<Altos
Record
> iterator, AltosGraphDataSet dataSet) {
+ public AltosGraphIterator (Iterator<Altos
State
> iterator, AltosGraphDataSet dataSet) {
this.iterator = iterator;
this.iterator = iterator;
- this.state = null;
this.dataSet = dataSet;
}
this.dataSet = dataSet;
}
@@
-62,7
+61,7
@@
class AltosGraphIterable implements Iterable<AltosUIDataPoint> {
AltosGraphDataSet dataSet;
public Iterator<AltosUIDataPoint> iterator() {
AltosGraphDataSet dataSet;
public Iterator<AltosUIDataPoint> iterator() {
- return new AltosGraphIterator(dataSet.
record
s.iterator(), dataSet);
+ return new AltosGraphIterator(dataSet.
state
s.iterator(), dataSet);
}
public AltosGraphIterable(AltosGraphDataSet dataSet) {
}
public AltosGraphIterable(AltosGraphDataSet dataSet) {
@@
-74,7
+73,7
@@
public class AltosGraphDataSet implements AltosUIDataSet {
String callsign;
int serial;
int flight;
String callsign;
int serial;
int flight;
- Altos
RecordIterable record
s;
+ Altos
StateIterable state
s;
public String name() {
if (callsign != null)
public String name() {
if (callsign != null)
@@
-87,8
+86,8
@@
public class AltosGraphDataSet implements AltosUIDataSet {
return new AltosGraphIterable(this);
}
return new AltosGraphIterable(this);
}
- public AltosGraphDataSet (Altos
RecordIterable record
s) {
- this.
records = record
s;
+ public AltosGraphDataSet (Altos
StateIterable state
s) {
+ this.
states = state
s;
this.callsign = null;
this.serial = 0;
this.flight = 0;
this.callsign = null;
this.serial = 0;
this.flight = 0;