X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosGraphDataSet.java;h=a90c25636033bc487e4e9b49976f372d8db6c8cb;hp=092b7c74418e504b6202f337a72bc163fa6bb442;hb=f80075be4ebb9c5fe00c24b8c7638fad23267424;hpb=2efd3ad80d4fefa8ccc1b80a2e657dbf9ba0c60f

diff --git a/altosui/AltosGraphDataSet.java b/altosui/AltosGraphDataSet.java
index 092b7c74..a90c2563 100644
--- a/altosui/AltosGraphDataSet.java
+++ b/altosui/AltosGraphDataSet.java
@@ -20,37 +20,36 @@ package altosui;
 import java.lang.*;
 import java.io.*;
 import java.util.*;
-import org.altusmetrum.altoslib_1.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;
 
 class AltosGraphIterator implements Iterator<AltosUIDataPoint> {
 	AltosGraphDataSet	dataSet;
-	Iterator<AltosRecord>	iterator;
-
-	AltosState	state;
+	Iterator<AltosState>	iterator;
 
 	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);
 	}
 
-	public AltosGraphIterator (Iterator<AltosRecord> iterator, AltosGraphDataSet dataSet) {
+	public AltosGraphIterator (Iterator<AltosState> iterator, AltosGraphDataSet dataSet) {
 		this.iterator = iterator;
-		this.state = null;
 		this.dataSet = dataSet;
 	}
 
@@ -62,7 +61,7 @@ class AltosGraphIterable implements Iterable<AltosUIDataPoint> {
 	AltosGraphDataSet	dataSet;
 
 	public Iterator<AltosUIDataPoint> iterator() {
-		return new AltosGraphIterator(dataSet.records.iterator(), dataSet);
+		return new AltosGraphIterator(dataSet.states.iterator(), dataSet);
 	}
 
 	public AltosGraphIterable(AltosGraphDataSet dataSet) {
@@ -74,7 +73,7 @@ public class AltosGraphDataSet implements AltosUIDataSet {
 	String			callsign;
 	int			serial;
 	int			flight;
-	AltosRecordIterable	records;
+	AltosStateIterable	states;
 
 	public String name() {
 		if (callsign != null)
@@ -87,8 +86,8 @@ public class AltosGraphDataSet implements AltosUIDataSet {
 		return new AltosGraphIterable(this);
 	}
 
-	public AltosGraphDataSet (AltosRecordIterable records) {
-		this.records = records;
+	public AltosGraphDataSet (AltosStateIterable states) {
+		this.states = states;
 		this.callsign = null;
 		this.serial = 0;
 		this.flight = 0;