X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosGraphUI.java;h=042f9277c2cf40e8335d9b46d9f5bda727b7c9e1;hb=6e4c104c28952f2010c7b1cbc9ce59e148ab2d8f;hp=71aa0e6f9c719669ae54a56e182f85d510dc25a2;hpb=b6b5c64f93fa56bcb22ea1c4279e4f754e6e6f1c;p=fw%2Faltos

diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java
index 71aa0e6f..042f9277 100644
--- a/altosui/AltosGraphUI.java
+++ b/altosui/AltosGraphUI.java
@@ -24,8 +24,8 @@ import java.util.ArrayList;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_11.*;
-import org.altusmetrum.altosuilib_11.*;
+import org.altusmetrum.altoslib_12.*;
+import org.altusmetrum.altosuilib_12.*;
 
 import org.jfree.chart.ChartPanel;
 import org.jfree.chart.JFreeChart;
@@ -34,7 +34,7 @@ import org.jfree.ui.RefineryUtilities;
 public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, AltosUnitsListener
 {
 	JTabbedPane		pane;
-	AltosGraphNew		graph;
+	AltosGraph		graph;
 	AltosUIEnable		enable;
 	AltosUIMap		map;
 	AltosFlightStats	stats;
@@ -48,7 +48,6 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
 
 		if (flight_series.gps_series != null) {
 			for (AltosGPSTimeValue gtv : flight_series.gps_series) {
-				gtv_last = gtv;
 				AltosGPS gps = gtv.gps;
 				if (gps != null &&
 				    gps.locked &&
@@ -57,6 +56,7 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
 						map = new AltosUIMap();
 					map.show(gps, (int) flight_series.value_before(AltosFlightSeries.state_name, gtv.time));
 					this.gps = gps;
+					gtv_last = gtv;
 					has_gps = true;
 				}
 			}
@@ -99,7 +99,7 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
 
 		stats = new AltosFlightStats(flight_series);
 
-		graph = new AltosGraphNew(enable, stats, flight_series, cal_data);
+		graph = new AltosGraph(enable, stats, flight_series);
 
 		statsTable = new AltosFlightStatsTable(stats);