projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Adapt to AltosFlightSeries for data analysis
[fw/altos]
/
altosui
/
AltosGraphUI.java
diff --git
a/altosui/AltosGraphUI.java
b/altosui/AltosGraphUI.java
index f5e339a59a2d26b3968b54d39174a1291c57510f..5314a3b6fb025e837593fc7b6653c3eac8683db5 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
*
* 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
*
* 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 java.awt.*;
import java.awt.event.*;
import javax.swing.*;
-import org.altusmetrum.altoslib_
6
.*;
-import org.altusmetrum.altosuilib_
6
.*;
+import org.altusmetrum.altoslib_
11
.*;
+import org.altusmetrum.altosuilib_
11
.*;
import org.jfree.chart.ChartPanel;
import org.jfree.chart.JFreeChart;
import org.jfree.chart.ChartPanel;
import org.jfree.chart.JFreeChart;
@@
-33,22
+34,26
@@
import org.jfree.ui.RefineryUtilities;
public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, AltosUnitsListener
{
JTabbedPane pane;
public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, AltosUnitsListener
{
JTabbedPane pane;
- AltosGraph
graph;
+ AltosGraph
New
graph;
AltosUIEnable enable;
AltosUIMap map;
AltosUIEnable enable;
AltosUIMap map;
- AltosState state;
- AltosGraphDataSet graphDataSet;
AltosFlightStats stats;
AltosFlightStatsTable statsTable;
AltosFlightStats stats;
AltosFlightStatsTable statsTable;
+ AltosGPS gps;
boolean has_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;
+
+ 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();
if (map == null)
map = new AltosUIMap();
- map.show(state, null);
+ map.show(gps, AltosLib.ao_flight_pad);
+ this.gps = gps;
has_gps = true;
}
}
has_gps = true;
}
}
@@
-68,18
+73,24
@@
public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
enable.units_changed(imperial_units);
}
enable.units_changed(imperial_units);
}
- AltosGraphUI(Altos
StateIterable states
, File file) throws InterruptedException, IOException {
+ AltosGraphUI(Altos
RecordSet set
, File file) throws InterruptedException, IOException {
super(file.getName());
super(file.getName());
- state = null;
+ AltosCalData cal_data = set.cal_data();
+
pane = new JTabbedPane();
enable = new AltosUIEnable();
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.fill_in();
+
+ stats = new AltosFlightStats(flight_series);
- graph = new AltosGraph
(enable, stats, graphDataSet
);
+ graph = new AltosGraph
New(enable, stats, flight_series, cal_data
);
statsTable = new AltosFlightStatsTable(stats);
statsTable = new AltosFlightStatsTable(stats);
@@
-88,7
+99,7
@@
public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
pane.add("Flight Statistics", statsTable);
has_gps = false;
pane.add("Flight Statistics", statsTable);
has_gps = false;
- fill_map(
stat
es);
+ fill_map(
flight_seri
es);
if (has_gps)
pane.add("Map", map);
if (has_gps)
pane.add("Map", map);
@@
-100,8
+111,6
@@
public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
addWindowListener(new WindowAdapter() {
@Override
public void windowClosing(WindowEvent e) {
addWindowListener(new WindowAdapter() {
@Override
public void windowClosing(WindowEvent e) {
- setVisible(false);
- dispose();
AltosUIPreferences.unregister_font_listener(AltosGraphUI.this);
AltosPreferences.unregister_units_listener(AltosGraphUI.this);
}
AltosUIPreferences.unregister_font_listener(AltosGraphUI.this);
AltosPreferences.unregister_units_listener(AltosGraphUI.this);
}
@@
-109,7
+118,7
@@
public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
pack();
setVisible(true);
pack();
setVisible(true);
- if (
state != null && has_gps
)
- map.centre(
state
);
+ if (
gps != null
)
+ map.centre(
gps
);
}
}
}
}