projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib, altosui, telegps: Add configuration support for APRS offset
[fw/altos]
/
altosui
/
AltosGraphUI.java
diff --git
a/altosui/AltosGraphUI.java
b/altosui/AltosGraphUI.java
index f387ed9bcceab91f8fda37c78a24393104537b2f..127a5beb0fd1566dc8ca28ca56a25b68ca892f15 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
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;
@@
-45,6
+45,7
@@
public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
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) {
@@
-54,7
+55,9
@@
public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
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;
gtv_last = gtv;
has_gps = true;
this.gps = gps;
gtv_last = gtv;
has_gps = true;
@@
-63,8
+66,9
@@
public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
}
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
);
}
}
}
}