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

diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java
index be63c6e6..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
@@ -33,9 +34,9 @@ import org.jfree.ui.RefineryUtilities;
 public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, AltosUnitsListener
 {
 	JTabbedPane		pane;
-	AltosGraph		graph;
+	AltosGraphNew		graph;
 	AltosUIEnable		enable;
-	AltosUIMapNew		map;
+	AltosUIMap		map;
 	AltosState		state;
 	AltosGraphDataSet	graphDataSet;
 	AltosFlightStats	stats;
@@ -47,7 +48,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 AltosUIMapNew();
+					map = new AltosUIMap();
 				map.show(state, null);
 				has_gps = true;
 			}
@@ -68,7 +69,7 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
 			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;
 
@@ -77,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);
 
@@ -100,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);
 				}