projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/lpc: Add fast timer
[fw/altos]
/
altosui
/
AltosGraphUI.java
diff --git
a/altosui/AltosGraphUI.java
b/altosui/AltosGraphUI.java
index ddd281a6d41813453cedb2a932211eb99d7d88c9..8e12f229a8cefd710372a80230817af4cc069f12 100644
(file)
--- a/
altosui/AltosGraphUI.java
+++ b/
altosui/AltosGraphUI.java
@@
-23,8
+23,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_
5
.*;
-import org.altusmetrum.altosuilib_
3
.*;
+import org.altusmetrum.altoslib_
9
.*;
+import org.altusmetrum.altosuilib_
9
.*;
import org.jfree.chart.ChartPanel;
import org.jfree.chart.JFreeChart;
import org.jfree.chart.ChartPanel;
import org.jfree.chart.JFreeChart;
@@
-35,7
+35,7
@@
public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
JTabbedPane pane;
AltosGraph graph;
AltosUIEnable enable;
JTabbedPane pane;
AltosGraph graph;
AltosUIEnable enable;
- AltosUIMap
map;
+ AltosUIMap
New
map;
AltosState state;
AltosGraphDataSet graphDataSet;
AltosFlightStats stats;
AltosState state;
AltosGraphDataSet graphDataSet;
AltosFlightStats stats;
@@
-47,7
+47,7
@@
public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
for (AltosState state : states) {
if (state.gps != null && state.gps.locked && state.gps.nsat >= 4) {
if (map == null)
for (AltosState state : states) {
if (state.gps != null && state.gps.locked && state.gps.nsat >= 4) {
if (map == null)
- map = new AltosUIMap();
+ map = new AltosUIMap
New
();
map.show(state, null);
has_gps = true;
}
map.show(state, null);
has_gps = true;
}
@@
-55,12
+55,17
@@
public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
}
public void font_size_changed(int font_size) {
}
public void font_size_changed(int font_size) {
- map.font_size_changed(font_size);
- statsTable.font_size_changed(font_size);
+ if (map != null)
+ map.font_size_changed(font_size);
+ if (statsTable != null)
+ statsTable.font_size_changed(font_size);
}
public void units_changed(boolean imperial_units) {
}
public void units_changed(boolean imperial_units) {
- map.units_changed(imperial_units);
+ if (map != null)
+ map.units_changed(imperial_units);
+ if (enable != null)
+ enable.units_changed(imperial_units);
}
AltosGraphUI(AltosStateIterable states, File file) throws InterruptedException, IOException {
}
AltosGraphUI(AltosStateIterable states, File file) throws InterruptedException, IOException {