import java.awt.*;
import javax.swing.*;
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_3.*;
import org.altusmetrum.altosuilib_1.*;
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
{
JTabbedPane pane;
AltosGraph graph;
AltosUIEnable enable;
AltosSiteMap map;
AltosState state;
+ AltosGraphDataSet graphDataSet;
+ AltosFlightStats stats;
+ AltosFlightStatsTable statsTable;
+ boolean has_gps;
- boolean fill_map(AltosRecordIterable records) {
+ void fill_map(AltosStateIterable states) {
boolean any_gps = false;
- for (AltosRecord record : records) {
- state = new AltosState(record, state);
- if (state.data.gps != null) {
- map.show(state, 0);
- any_gps = true;
+ for (AltosState state : states) {
+ if (state.gps != null && state.gps.locked && state.gps.nsat >= 4) {
+ if (map == null)
+ map = new AltosSiteMap();
+ map.show(state, null);
+ has_gps = true;
}
}
- return any_gps;
}
- AltosGraphUI(AltosRecordIterable records, File file) throws InterruptedException, IOException {
+ AltosGraphUI(AltosStateIterable states, File file) throws InterruptedException, IOException {
super(file.getName());
state = null;
enable = new AltosUIEnable();
- AltosGraph graph = new AltosGraph(enable);
+ stats = new AltosFlightStats(states);
+ graphDataSet = new AltosGraphDataSet(states);
- graph.setDataSet(new AltosGraphDataSet(records));
+ graph = new AltosGraph(enable, stats, graphDataSet);
- map = new AltosSiteMap();
+ statsTable = new AltosFlightStatsTable(stats);
pane.add("Flight Graph", graph.panel);
pane.add("Configure Graph", enable);
+ pane.add("Flight Statistics", statsTable);
- AltosFlightStatsTable stats = new AltosFlightStatsTable(new AltosFlightStats(records));
- pane.add("Flight Statistics", stats);
-
- if (fill_map(records))
+ has_gps = false;
+ fill_map(states);
+ if (has_gps)
pane.add("Map", map);
setContentPane (pane);
setDefaultCloseOperation(DISPOSE_ON_CLOSE);
setVisible(true);
- if (state != null)
+ if (state != null && has_gps)
map.centre(state);
}
}