projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Convert IMU and Mag sensor values to useful units
[fw/altos]
/
altosui
/
AltosGraphUI.java
diff --git
a/altosui/AltosGraphUI.java
b/altosui/AltosGraphUI.java
index f6e57e7ec7c119308ed310d5b31772f413b4be4f..c42f7b5f89d4f346517fad948c5b3ec6a86229d4 100644
(file)
--- a/
altosui/AltosGraphUI.java
+++ b/
altosui/AltosGraphUI.java
@@
-9,7
+9,7
@@
import java.util.ArrayList;
import java.awt.*;
import javax.swing.*;
import java.awt.*;
import javax.swing.*;
-import org.altusmetrum.altoslib_
1
.*;
+import org.altusmetrum.altoslib_
2
.*;
import org.altusmetrum.altosuilib_1.*;
import org.jfree.chart.ChartPanel;
import org.altusmetrum.altosuilib_1.*;
import org.jfree.chart.ChartPanel;
@@
-28,20
+28,19
@@
public class AltosGraphUI extends AltosUIFrame
AltosFlightStatsTable statsTable;
boolean has_gps;
AltosFlightStatsTable statsTable;
boolean has_gps;
- void fill_map(Altos
RecordIterable record
s) {
+ void fill_map(Altos
StateIterable state
s) {
boolean any_gps = false;
boolean any_gps = false;
- for (AltosRecord record : records) {
- state = new AltosState(record, state);
+ for (AltosState state : states) {
if (state.gps != null && state.gps.locked && state.gps.nsat >= 4) {
if (map == null)
map = new AltosSiteMap();
if (state.gps != null && state.gps.locked && state.gps.nsat >= 4) {
if (map == null)
map = new AltosSiteMap();
- map.show(state,
0
);
+ map.show(state,
null
);
has_gps = true;
}
}
}
has_gps = true;
}
}
}
- AltosGraphUI(Altos
RecordIterable record
s, File file) throws InterruptedException, IOException {
+ AltosGraphUI(Altos
StateIterable state
s, File file) throws InterruptedException, IOException {
super(file.getName());
state = null;
super(file.getName());
state = null;
@@
-49,8
+48,8
@@
public class AltosGraphUI extends AltosUIFrame
enable = new AltosUIEnable();
enable = new AltosUIEnable();
- stats = new AltosFlightStats(
record
s);
- graphDataSet = new AltosGraphDataSet(
record
s);
+ stats = new AltosFlightStats(
state
s);
+ graphDataSet = new AltosGraphDataSet(
state
s);
graph = new AltosGraph(enable, stats, graphDataSet);
graph = new AltosGraph(enable, stats, graphDataSet);
@@
-61,7
+60,7
@@
public class AltosGraphUI extends AltosUIFrame
pane.add("Flight Statistics", statsTable);
has_gps = false;
pane.add("Flight Statistics", statsTable);
has_gps = false;
- fill_map(
record
s);
+ fill_map(
state
s);
if (has_gps)
pane.add("Map", map);
if (has_gps)
pane.add("Map", map);