X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=telegps%2FTeleGPSGraphUI.java;h=e9fc683101b637bf4f1d3596ddf2227dfb1de91f;hp=5d4fc9cf8be5137500ada48aaa7d0cf867876fe0;hb=52149fd81df45f37f5097850795f290f463c43ef;hpb=297eb795b24ec31f6599f48bc8c3769557a7ec6f

diff --git a/telegps/TeleGPSGraphUI.java b/telegps/TeleGPSGraphUI.java
index 5d4fc9cf..e9fc6831 100644
--- a/telegps/TeleGPSGraphUI.java
+++ b/telegps/TeleGPSGraphUI.java
@@ -27,8 +27,8 @@ import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
 import java.util.*;
-import org.altusmetrum.altoslib_13.*;
-import org.altusmetrum.altosuilib_13.*;
+import org.altusmetrum.altoslib_14.*;
+import org.altusmetrum.altosuilib_14.*;
 
 import org.jfree.chart.ChartPanel;
 import org.jfree.chart.JFreeChart;
@@ -49,6 +49,7 @@ public class TeleGPSGraphUI extends AltosUIFrame implements AltosFontListener, A
 	void fill_map(AltosFlightSeries flight_series) {
 		boolean			any_gps = false;
 		AltosGPSTimeValue	gtv_last = null;
+		double gps_pad_altitude = flight_series.cal_data().gps_pad_altitude;;
 
 		if (flight_series.gps_series != null) {
 			for (AltosGPSTimeValue gtv : flight_series.gps_series) {
@@ -59,7 +60,9 @@ public class TeleGPSGraphUI extends AltosUIFrame implements AltosFontListener, A
 				    gps.nsat >= 4) {
 					if (map == null)
 						map = new AltosUIMap();
-					map.show(gps, (int) flight_series.value_before(AltosFlightSeries.state_name, gtv.time));
+					double gps_height = gps.alt - gps_pad_altitude;
+					int state = (int) flight_series.value_before(AltosFlightSeries.state_name, gtv.time);
+					map.show(gps, gtv.time, state, gps_height);
 					this.gps = gps;
 					has_gps = true;
 				}
@@ -67,8 +70,9 @@ public class TeleGPSGraphUI extends AltosUIFrame implements AltosFontListener, A
 		}
 		if (gtv_last != null) {
 			int state = (int) flight_series.value_after(AltosFlightSeries.state_name, gtv_last.time);
+			double gps_height = gps.alt - gps_pad_altitude;
 			if (state == AltosLib.ao_flight_landed)
-				map.show(gtv_last.gps, state);
+				map.show(gtv_last.gps, gtv_last.time, state, gps_height);
 		}
 	}
 
@@ -113,17 +117,19 @@ public class TeleGPSGraphUI extends AltosUIFrame implements AltosFontListener, A
 		super(file.getName());
 		AltosCalData cal_data = set.cal_data();
 
+		pane = new JTabbedPane();
+
 		flight_series = new AltosUIFlightSeries(cal_data);
-		set.capture_series(flight_series);
-		flight_series.finish();
 
-		pane = new JTabbedPane();
+		enable = new AltosUIEnable(this);
 
-		graph = new AltosGraph(enable, stats, flight_series);
+		set.capture_series(flight_series);
+
+		flight_series.finish();
 
 		stats = new AltosFlightStats(flight_series);
 
-		enable = new AltosUIEnable(this);
+		graph = new AltosGraph(enable, stats, flight_series);
 
 		statsTable = new AltosFlightStatsTable(stats);