X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosGraphUI.java;h=50a1948ececfb4d107c8eb37ef41fc7b570f4f63;hp=4f394d73fb932a617bc62a806e7b1ab313640768;hb=bbe0c2e0a3216f40f49af34b756330ba28d7c7e1;hpb=2a4d741872449b5332f28e018fa3acc53ed7d891 diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java index 4f394d73..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,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; @@ -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);