altoslib: Make sure AltosFlightSeries is filled in before use

[fw/altos] / altosui / AltosGraphUI.java

diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java
index 40d2f7f4bc40dc83f091ba95e6250ddb740376e7..db0cac2ffe178b60c58cfd27595893f23d49385a 100644 (file)
--- a/altosui/AltosGraphUI.java
+++ b/altosui/AltosGraphUI.java
@@ -1,6 +1,20 @@
-
-// Copyright (c) 2010 Anthony Towns
-// GPL v2 or later
+/*
+ * Copyright © 2010 Anthony Towns
+ *
+ * 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; 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
 
 package altosui;
 
@@ -8,50 +22,82 @@ import java.io.*;
 import java.util.ArrayList;
 
 import java.awt.*;
+import java.awt.event.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_3.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_11.*;
+import org.altusmetrum.altosuilib_11.*;
 
 import org.jfree.chart.ChartPanel;
 import org.jfree.chart.JFreeChart;
 import org.jfree.ui.RefineryUtilities;
 
-public class AltosGraphUI extends AltosUIFrame 
+public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, AltosUnitsListener
 {
        JTabbedPane             pane;
-       AltosGraph              graph;
+       AltosGraphNew           graph;
        AltosUIEnable           enable;
-       AltosSiteMap            map;
-       AltosState              state;
-       AltosGraphDataSet       graphDataSet;
+       AltosUIMap              map;
        AltosFlightStats        stats;
        AltosFlightStatsTable   statsTable;
+       AltosGPS                gps;
        boolean                 has_gps;
 
-       void fill_map(AltosStateIterable states) {
-               boolean         any_gps = false;
-               for (AltosState state : states) {
-                       if (state.gps != null && state.gps.locked && state.gps.nsat >= 4) {
+       void fill_map(AltosFlightSeries flight_series) {
+               boolean                 any_gps = false;
+               AltosGPSTimeValue       gtv_last = null;
+
+               for (AltosGPSTimeValue gtv : flight_series.gps_series) {
+                       gtv_last = gtv;
+                       AltosGPS gps = gtv.gps;
+                       if (gps != null &&
+                           gps.locked &&
+                           gps.nsat >= 4) {
                                if (map == null)
-                                       map = new AltosSiteMap();
-                               map.show(state, null);
+                                       map = new AltosUIMap();
+                               map.show(gps, (int) flight_series.value_before(AltosFlightSeries.state_name, gtv.time));
+                               this.gps = gps;
                                has_gps = true;
                        }
                }
+               if (gtv_last != null) {
+                       int state = (int) flight_series.value_after(AltosFlightSeries.state_name, gtv_last.time);
+                       if (state == AltosLib.ao_flight_landed)
+                               map.show(gtv_last.gps, state);
+               }
+       }
+
+       public void font_size_changed(int 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) {
+               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(AltosRecordSet set, File file) throws InterruptedException, IOException {
                super(file.getName());
-               state = null;
+               AltosCalData    cal_data = set.cal_data();
+
 
                pane = new JTabbedPane();
 
                enable = new AltosUIEnable();
 
-               stats = new AltosFlightStats(states);
-               graphDataSet = new AltosGraphDataSet(states);
+               AltosUIFlightSeries flight_series = new AltosUIFlightSeries(cal_data);
+
+               set.capture_series(flight_series);
 
-               graph = new AltosGraph(enable, stats, graphDataSet);
+               flight_series.finish();
+
+               stats = new AltosFlightStats(flight_series);
+
+               graph = new AltosGraphNew(enable, stats, flight_series, cal_data);
 
                statsTable = new AltosFlightStatsTable(stats);
 
@@ -60,17 +106,26 @@ public class AltosGraphUI extends AltosUIFrame
                pane.add("Flight Statistics", statsTable);
 
                has_gps = false;
-               fill_map(states);
+               fill_map(flight_series);
                if (has_gps)
                        pane.add("Map", map);
 
                setContentPane (pane);
 
+               AltosUIPreferences.register_font_listener(this);
+               AltosPreferences.register_units_listener(this);
+
+               addWindowListener(new WindowAdapter() {
+                               @Override
+                               public void windowClosing(WindowEvent e) {
+                                       AltosUIPreferences.unregister_font_listener(AltosGraphUI.this);
+                                       AltosPreferences.unregister_units_listener(AltosGraphUI.this);
+                               }
+                       });
                pack();
 
-               setDefaultCloseOperation(DISPOSE_ON_CLOSE);
                setVisible(true);
-               if (state != null && has_gps)
-                       map.centre(state);
+               if (gps != null)
+                       map.centre(gps);
        }
 }