X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosGraphUI.java;h=6e45a092a678b1fc751181ce223135fc0782637c;hp=07fe93176c33dd68d71bfec4f47e7ff8a9222c6a;hb=d6445b3739ac2c5dd040efdb97317a6b2a48044a;hpb=bfc0c65c9f9ec9547d71016fc897ba35bdb414f8

diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java
index 07fe9317..6e45a092 100644
--- a/altosui/AltosGraphUI.java
+++ b/altosui/AltosGraphUI.java
@@ -23,8 +23,8 @@ import java.util.ArrayList;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_4.*;
-import org.altusmetrum.altosuilib_2.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 import org.jfree.chart.ChartPanel;
 import org.jfree.chart.JFreeChart;
@@ -35,7 +35,7 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
 	JTabbedPane		pane;
 	AltosGraph		graph;
 	AltosUIEnable		enable;
-	AltosUIMap		map;
+	AltosUIMapNew		map;
 	AltosState		state;
 	AltosGraphDataSet	graphDataSet;
 	AltosFlightStats	stats;
@@ -47,7 +47,7 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
 		for (AltosState state : states) {
 			if (state.gps != null && state.gps.locked && state.gps.nsat >= 4) {
 				if (map == null)
-					map = new AltosUIMap();
+					map = new AltosUIMapNew();
 				map.show(state, null);
 				has_gps = true;
 			}
@@ -55,12 +55,17 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
 	}
 
 	public void font_size_changed(int font_size) {
-		map.font_size_changed(font_size);
-		statsTable.font_size_changed(font_size);
+		if (map != null)
+			map.font_size_changed(font_size);
+		if (statsTable != null)
+			statsTable.font_size_changed(font_size);
 	}
 
 	public void units_changed(boolean imperial_units) {
-		map.units_changed(imperial_units);
+		if (map != null)
+			map.units_changed(imperial_units);
+		if (enable != null)
+			enable.units_changed(imperial_units);
 	}
 
 	AltosGraphUI(AltosStateIterable states, File file) throws InterruptedException, IOException {