X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosGraphUI.java;h=705436107ba3916842050542e49609ecca21ce9b;hp=34d56b24f0d625716d4f69235a2c94efae78de2c;hb=master;hpb=21d176f161b90f18f236ef887cef9676d712eee3 diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java index 34d56b24..8f52728b 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,35 +24,54 @@ import java.util.ArrayList; import java.awt.*; import java.awt.event.*; import javax.swing.*; -import org.altusmetrum.altoslib_10.*; -import org.altusmetrum.altosuilib_10.*; +import org.altusmetrum.altoslib_14.*; +import org.altusmetrum.altosuilib_14.*; import org.jfree.chart.ChartPanel; import org.jfree.chart.JFreeChart; import org.jfree.ui.RefineryUtilities; -public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, AltosUnitsListener +public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, AltosUnitsListener, AltosFilterListener { JTabbedPane pane; AltosGraph graph; AltosUIEnable enable; - AltosUIMapNew map; - AltosState state; - AltosGraphDataSet graphDataSet; + AltosUIMap map; AltosFlightStats stats; AltosFlightStatsTable statsTable; + AltosFlightConfigTable configTable; + AltosFlightPyroTable pyroTable; + 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) { - if (map == null) - map = new AltosUIMapNew(); - map.show(state, null); - has_gps = true; + void fill_map(AltosFlightSeries flight_series) { + boolean any_gps = false; + AltosGPSTimeValue gtv_last = null; + double gps_pad_altitude = flight_series.cal_data().gps_pad_altitude;; + + if (flight_series.gps_series != null) { + for (AltosGPSTimeValue gtv : flight_series.gps_series) { + AltosGPS gps = gtv.gps; + if (gps != null && + gps.locked && + gps.nsat >= 4) { + if (map == null) + map = new AltosUIMap(); + double gps_height = gps.alt - gps_pad_altitude; + int state = (int) flight_series.value_before(AltosFlightSeries.state_name, gtv.time); + map.show(gps, gtv.time, state, gps_height); + this.gps = gps; + gtv_last = gtv; + has_gps = true; + } } } + if (gtv_last != null) { + int state = (int) flight_series.value_after(AltosFlightSeries.state_name, gtv_last.time); + double gps_height = gps.alt - gps_pad_altitude; + if (state == AltosLib.ao_flight_landed) + map.show(gtv_last.gps, gtv_last.time, state,gps_height); + } } public void font_size_changed(int font_size) { @@ -59,6 +79,10 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt map.font_size_changed(font_size); if (statsTable != null) statsTable.font_size_changed(font_size); + if (configTable != null) + configTable.font_size_changed(font_size); + if (pyroTable != null) + pyroTable.font_size_changed(font_size); } public void units_changed(boolean imperial_units) { @@ -66,29 +90,64 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt map.units_changed(imperial_units); if (enable != null) enable.units_changed(imperial_units); + if (configTable != null) + configTable.units_changed(imperial_units); + if (pyroTable != null) + pyroTable.units_changed(imperial_units); + } + + AltosUIFlightSeries flight_series; + + public void filter_changed(double speed_filter, double accel_filter) { + flight_series.set_filter(speed_filter, accel_filter); + graph.filter_changed(); + stats = new AltosFlightStats(flight_series); + statsTable.filter_changed(stats); + } + + public double speed_filter() { + return flight_series.speed_filter_width; } - AltosGraphUI(AltosStateIterable states, File file) throws InterruptedException, IOException { + public double accel_filter() { + return flight_series.accel_filter_width; + } + + AltosGraphUI(AltosRecordSet set, File file) throws InterruptedException, IOException { super(file.getName()); - state = null; + AltosCalData cal_data = set.cal_data(); + AltosConfigData config_data = set.config_data(); pane = new JTabbedPane(); - enable = new AltosUIEnable(); + flight_series = new AltosUIFlightSeries(cal_data); + + enable = new AltosUIEnable(this); + + set.capture_series(flight_series); - stats = new AltosFlightStats(states); - graphDataSet = new AltosGraphDataSet(states); + flight_series.finish(); - graph = new AltosGraph(enable, stats, graphDataSet); + stats = new AltosFlightStats(flight_series); + + graph = new AltosGraph(enable, stats, flight_series); statsTable = new AltosFlightStatsTable(stats); pane.add("Flight Graph", graph.panel); pane.add("Configure Graph", enable); pane.add("Flight Statistics", statsTable); + if (config_data != null) { + configTable = new AltosFlightConfigTable(config_data); + pane.add("Configuration", configTable); + if (config_data.npyro > 0) { + pyroTable = new AltosFlightPyroTable(config_data.pyros, config_data.npyro); + pane.add("Pyros", pyroTable); + } + } has_gps = false; - fill_map(states); + fill_map(flight_series); if (has_gps) pane.add("Map", map); @@ -100,8 +159,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 +166,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); } }