projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump java lib versions in preparation for 1.9.2
[fw/altos]
/
telegps
/
TeleGPSGraphUI.java
diff --git
a/telegps/TeleGPSGraphUI.java
b/telegps/TeleGPSGraphUI.java
index c68f2badbdaf3a06a00e35454fa5b69e7a58fe85..e9fc683101b637bf4f1d3596ddf2227dfb1de91f 100644
(file)
--- a/
telegps/TeleGPSGraphUI.java
+++ b/
telegps/TeleGPSGraphUI.java
@@
-27,8
+27,8
@@
import javax.swing.*;
import java.io.*;
import java.util.concurrent.*;
import java.util.*;
import java.io.*;
import java.util.concurrent.*;
import java.util.*;
-import org.altusmetrum.altoslib_1
2
.*;
-import org.altusmetrum.altosuilib_1
2
.*;
+import org.altusmetrum.altoslib_1
4
.*;
+import org.altusmetrum.altosuilib_1
4
.*;
import org.jfree.chart.ChartPanel;
import org.jfree.chart.JFreeChart;
import org.jfree.chart.ChartPanel;
import org.jfree.chart.JFreeChart;
@@
-49,6
+49,7
@@
public class TeleGPSGraphUI extends AltosUIFrame implements AltosFontListener, A
void fill_map(AltosFlightSeries flight_series) {
boolean any_gps = false;
AltosGPSTimeValue gtv_last = null;
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) {
if (flight_series.gps_series != null) {
for (AltosGPSTimeValue gtv : flight_series.gps_series) {
@@
-59,7
+60,9
@@
public class TeleGPSGraphUI extends AltosUIFrame implements AltosFontListener, A
gps.nsat >= 4) {
if (map == null)
map = new AltosUIMap();
gps.nsat >= 4) {
if (map == null)
map = new AltosUIMap();
- map.show(gps, (int) flight_series.value_before(AltosFlightSeries.state_name, gtv.time));
+ 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;
has_gps = true;
}
this.gps = gps;
has_gps = true;
}
@@
-67,8
+70,9
@@
public class TeleGPSGraphUI extends AltosUIFrame implements AltosFontListener, A
}
if (gtv_last != null) {
int state = (int) flight_series.value_after(AltosFlightSeries.state_name, gtv_last.time);
}
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)
if (state == AltosLib.ao_flight_landed)
- map.show(gtv_last.gps,
state
);
+ map.show(gtv_last.gps,
gtv_last.time, state, gps_height
);
}
}
}
}
@@
-113,17
+117,19
@@
public class TeleGPSGraphUI extends AltosUIFrame implements AltosFontListener, A
super(file.getName());
AltosCalData cal_data = set.cal_data();
super(file.getName());
AltosCalData cal_data = set.cal_data();
+ pane = new JTabbedPane();
+
flight_series = new AltosUIFlightSeries(cal_data);
flight_series = new AltosUIFlightSeries(cal_data);
- set.capture_series(flight_series);
- flight_series.finish();
-
pane = new JTabbedPane(
);
+
enable = new AltosUIEnable(this
);
- graph = new AltosGraph(enable, stats, flight_series);
+ set.capture_series(flight_series);
+
+ flight_series.finish();
stats = new AltosFlightStats(flight_series);
stats = new AltosFlightStats(flight_series);
-
enable = new AltosUIEnable(thi
s);
+
graph = new AltosGraph(enable, stats, flight_serie
s);
statsTable = new AltosFlightStatsTable(stats);
statsTable = new AltosFlightStatsTable(stats);