From: Keith Packard <keithp@keithp.com>
Date: Sat, 11 May 2013 02:21:18 +0000 (-0700)
Subject: altosui: Wait for valid callsign/flight when graphing
X-Git-Tag: 1.2.1~18
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=9bd717e71d69338b1af521b37e8bd975e503398e

altosui: Wait for valid callsign/flight when graphing

Wait for the data record to indicate that the flight value is valid
before setting the graph callsign/flight/serial data.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/altosui/AltosGraphDataSet.java b/altosui/AltosGraphDataSet.java
index 092b7c74..dc047e9a 100644
--- a/altosui/AltosGraphDataSet.java
+++ b/altosui/AltosGraphDataSet.java
@@ -36,14 +36,16 @@ class AltosGraphIterator implements Iterator<AltosUIDataPoint> {
 	public AltosUIDataPoint next() {
 		state = new AltosState(iterator.next(), state);
 
-		if (dataSet.callsign == null && state.data.callsign != null)
-			dataSet.callsign = state.data.callsign;
+		if ((state.data.seen & AltosRecord.seen_flight) != 0) {
+			if (dataSet.callsign == null && state.data.callsign != null)
+				dataSet.callsign = state.data.callsign;
 
-		if (dataSet.serial == 0 && state.data.serial != 0)
-			dataSet.serial = state.data.serial;
+			if (dataSet.serial == 0 && state.data.serial != 0)
+				dataSet.serial = state.data.serial;
 
-		if (dataSet.flight == 0 && state.data.flight != 0)
-			dataSet.flight = state.data.flight;
+			if (dataSet.flight == 0 && state.data.flight != 0)
+				dataSet.flight = state.data.flight;
+		}
 
 		return new AltosGraphDataPoint(state);
 	}