X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosGraphUI.java;h=50a1948ececfb4d107c8eb37ef41fc7b570f4f63;hp=ddd281a6d41813453cedb2a932211eb99d7d88c9;hb=bbe0c2e0a3216f40f49af34b756330ba28d7c7e1;hpb=c8078d352a7f54a4a97d25af080155d3f875536a

diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java
index ddd281a6..50a1948e 100644
--- a/altosui/AltosGraphUI.java
+++ b/altosui/AltosGraphUI.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 or any later version of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -23,8 +24,8 @@ import java.util.ArrayList;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_5.*;
-import org.altusmetrum.altosuilib_3.*;
+import org.altusmetrum.altoslib_11.*;
+import org.altusmetrum.altosuilib_11.*;
 
 import org.jfree.chart.ChartPanel;
 import org.jfree.chart.JFreeChart;
@@ -33,7 +34,7 @@ import org.jfree.ui.RefineryUtilities;
 public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, AltosUnitsListener
 {
 	JTabbedPane		pane;
-	AltosGraph		graph;
+	AltosGraphNew		graph;
 	AltosUIEnable		enable;
 	AltosUIMap		map;
 	AltosState		state;
@@ -55,15 +56,20 @@ 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 {
+	AltosGraphUI(AltosStateIterable states, AltosRecordSet record_set, File file) throws InterruptedException, IOException {
 		super(file.getName());
 		state = null;
 
@@ -72,9 +78,9 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
 		enable = new AltosUIEnable();
 
 		stats = new AltosFlightStats(states);
-		graphDataSet = new AltosGraphDataSet(states);
+//		graphDataSet = new AltosGraphDataSet(states);
 
-		graph = new AltosGraph(enable, stats, graphDataSet);
+		graph = new AltosGraphNew(enable, stats, record_set);
 
 		statsTable = new AltosFlightStatsTable(stats);
 
@@ -95,8 +101,6 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
 		addWindowListener(new WindowAdapter() {
 				@Override
 				public void windowClosing(WindowEvent e) {
-					setVisible(false);
-					dispose();
 					AltosUIPreferences.unregister_font_listener(AltosGraphUI.this);
 					AltosPreferences.unregister_units_listener(AltosGraphUI.this);
 				}