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 6e45a092a678b1fc751181ce223135fc0782637c..db0cac2ffe178b60c58cfd27595893f23d49385a 100644 (file)
--- 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_8.*;
-import org.altusmetrum.altosuilib_8.*;
+import org.altusmetrum.altoslib_11.*;
+import org.altusmetrum.altosuilib_11.*;
 
 import org.jfree.chart.ChartPanel;
 import org.jfree.chart.JFreeChart;
@@ -33,25 +34,36 @@ import org.jfree.ui.RefineryUtilities;
 public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, AltosUnitsListener
 {
        JTabbedPane             pane;
-       AltosGraph              graph;
+       AltosGraphNew           graph;
        AltosUIEnable           enable;
-       AltosUIMapNew           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 AltosUIMapNew();
-                               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) {
@@ -68,18 +80,24 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
                        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);
+
+               flight_series.finish();
+
+               stats = new AltosFlightStats(flight_series);
 
-               graph = new AltosGraph(enable, stats, graphDataSet);
+               graph = new AltosGraphNew(enable, stats, flight_series, cal_data);
 
                statsTable = new AltosFlightStatsTable(stats);
 
@@ -88,7 +106,7 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
                pane.add("Flight Statistics", statsTable);
 
                has_gps = false;
-               fill_map(states);
+               fill_map(flight_series);
                if (has_gps)
                        pane.add("Map", map);
 
@@ -100,8 +118,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);
                                }
@@ -109,7 +125,7 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
                pack();
 
                setVisible(true);
-               if (state != null && has_gps)
-                       map.centre(state);
+               if (gps != null)
+                       map.centre(gps);
        }
 }