projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: gps serial routines are called ao_gps_*, not ao_ublox_*
[fw/altos]
/
altosui
/
AltosGraphUI.java
diff --git
a/altosui/AltosGraphUI.java
b/altosui/AltosGraphUI.java
index 2f3575a4387bbbd9e39f0e58a4a8394ce53a1f27..d8b8f6dd282d41b1bbce8b4724f7dac3212714a5 100644
(file)
--- a/
altosui/AltosGraphUI.java
+++ b/
altosui/AltosGraphUI.java
@@
-26,17
+26,19
@@
public class AltosGraphUI extends AltosUIFrame
AltosGraphDataSet graphDataSet;
AltosFlightStats stats;
AltosFlightStatsTable statsTable;
AltosGraphDataSet graphDataSet;
AltosFlightStats stats;
AltosFlightStatsTable statsTable;
+ boolean has_gps;
-
boolean
fill_map(AltosRecordIterable records) {
+
void
fill_map(AltosRecordIterable records) {
boolean any_gps = false;
for (AltosRecord record : records) {
state = new AltosState(record, state);
boolean any_gps = false;
for (AltosRecord record : records) {
state = new AltosState(record, state);
- if (state.gps.locked && state.gps.nsat >= 4) {
- map.show(state, 0);
- any_gps = true;
+ 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(AltosRecordIterable records, File file) throws InterruptedException, IOException {
@@
-54,13
+56,13
@@
public class AltosGraphUI extends AltosUIFrame
statsTable = new AltosFlightStatsTable(stats);
statsTable = new AltosFlightStatsTable(stats);
- map = new AltosSiteMap();
-
pane.add("Flight Graph", graph.panel);
pane.add("Configure Graph", enable);
pane.add("Flight Statistics", statsTable);
pane.add("Flight Graph", graph.panel);
pane.add("Configure Graph", enable);
pane.add("Flight Statistics", statsTable);
- if (fill_map(records))
+ has_gps = false;
+ fill_map(records);
+ if (has_gps)
pane.add("Map", map);
setContentPane (pane);
pane.add("Map", map);
setContentPane (pane);
@@
-69,7
+71,7
@@
public class AltosGraphUI extends AltosUIFrame
setDefaultCloseOperation(DISPOSE_ON_CLOSE);
setVisible(true);
setDefaultCloseOperation(DISPOSE_ON_CLOSE);
setVisible(true);
- if (state != null)
+ if (state != null
&& has_gps
)
map.centre(state);
}
}
map.centre(state);
}
}