projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Use SYSTICK on STM32L
[fw/altos]
/
altosui
/
AltosGraphUI.java
diff --git
a/altosui/AltosGraphUI.java
b/altosui/AltosGraphUI.java
index ac20f84b26a23ad7bfc4b22b6374348829778318..d8b8f6dd282d41b1bbce8b4724f7dac3212714a5 100644
(file)
--- a/
altosui/AltosGraphUI.java
+++ b/
altosui/AltosGraphUI.java
@@
-23,39
+23,46
@@
public class AltosGraphUI extends AltosUIFrame
AltosUIEnable enable;
AltosSiteMap map;
AltosState state;
AltosUIEnable enable;
AltosSiteMap map;
AltosState state;
+ 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.data.gps != null) {
- 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, String file) throws InterruptedException, IOException {
+ AltosGraphUI(AltosRecordIterable records, File file) throws InterruptedException, IOException {
+ super(file.getName());
state = null;
pane = new JTabbedPane();
enable = new AltosUIEnable();
state = null;
pane = new JTabbedPane();
enable = new AltosUIEnable();
- AltosGraph graph = new AltosGraph(enable);
+ stats = new AltosFlightStats(records);
+ graphDataSet = new AltosGraphDataSet(records);
- graph
.setDataSet(new AltosGraphDataSet(records)
);
+ graph
= new AltosGraph(enable, stats, graphDataSet
);
-
map = new AltosSiteMap(
);
+
statsTable = new AltosFlightStatsTable(stats
);
pane.add("Flight Graph", graph.panel);
pane.add("Configure Graph", enable);
pane.add("Flight Graph", graph.panel);
pane.add("Configure Graph", enable);
+ pane.add("Flight Statistics", statsTable);
- AltosFlightStatsTable stats = new AltosFlightStatsTable(new AltosFlightStats(records));
- pane.add("Flight Statistics", stats);
-
- 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);
@@
-64,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);
}
}