projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos]
/
altosui
/
AltosGraphUI.java
diff --git
a/altosui/AltosGraphUI.java
b/altosui/AltosGraphUI.java
index 71aa0e6f9c719669ae54a56e182f85d510dc25a2..042f9277c2cf40e8335d9b46d9f5bda727b7c9e1 100644
(file)
--- a/
altosui/AltosGraphUI.java
+++ b/
altosui/AltosGraphUI.java
@@
-24,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_1
1
.*;
-import org.altusmetrum.altosuilib_1
1
.*;
+import org.altusmetrum.altoslib_1
2
.*;
+import org.altusmetrum.altosuilib_1
2
.*;
import org.jfree.chart.ChartPanel;
import org.jfree.chart.JFreeChart;
import org.jfree.chart.ChartPanel;
import org.jfree.chart.JFreeChart;
@@
-34,7
+34,7
@@
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
New
graph;
+ AltosGraph
graph;
AltosUIEnable enable;
AltosUIMap map;
AltosFlightStats stats;
AltosUIEnable enable;
AltosUIMap map;
AltosFlightStats stats;
@@
-48,7
+48,6
@@
public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
if (flight_series.gps_series != null) {
for (AltosGPSTimeValue gtv : flight_series.gps_series) {
if (flight_series.gps_series != null) {
for (AltosGPSTimeValue gtv : flight_series.gps_series) {
- gtv_last = gtv;
AltosGPS gps = gtv.gps;
if (gps != null &&
gps.locked &&
AltosGPS gps = gtv.gps;
if (gps != null &&
gps.locked &&
@@
-57,6
+56,7
@@
public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
map = new AltosUIMap();
map.show(gps, (int) flight_series.value_before(AltosFlightSeries.state_name, gtv.time));
this.gps = gps;
map = new AltosUIMap();
map.show(gps, (int) flight_series.value_before(AltosFlightSeries.state_name, gtv.time));
this.gps = gps;
+ gtv_last = gtv;
has_gps = true;
}
}
has_gps = true;
}
}
@@
-99,7
+99,7
@@
public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
stats = new AltosFlightStats(flight_series);
stats = new AltosFlightStats(flight_series);
- graph = new AltosGraph
New(enable, stats, flight_series, cal_data
);
+ graph = new AltosGraph
(enable, stats, flight_series
);
statsTable = new AltosFlightStatsTable(stats);
statsTable = new AltosFlightStatsTable(stats);