projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Ship EasyMini v2.0 firwmare
[fw/altos]
/
altosui
/
AltosFlightUI.java
diff --git
a/altosui/AltosFlightUI.java
b/altosui/AltosFlightUI.java
index cf03d2dc3732562185f8c4ca4c33bbd2c4b18acd..8742b8ca33210b8983c2d5504b2266a472d8e58d 100644
(file)
--- a/
altosui/AltosFlightUI.java
+++ b/
altosui/AltosFlightUI.java
@@
-23,8
+23,8
@@
import java.awt.event.*;
import javax.swing.*;
import java.util.*;
import java.util.concurrent.*;
import javax.swing.*;
import java.util.*;
import java.util.concurrent.*;
-import org.altusmetrum.altoslib_1
1
.*;
-import org.altusmetrum.altosuilib_1
1
.*;
+import org.altusmetrum.altoslib_1
3
.*;
+import org.altusmetrum.altosuilib_1
3
.*;
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
AltosVoice voice;
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
AltosVoice voice;
@@
-36,7
+36,7
@@
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
JTabbedPane pane;
AltosPad pad;
JTabbedPane pane;
AltosPad pad;
- AltosIgnitor ignit
o
r;
+ AltosIgnitor ignit
e
r;
AltosAscent ascent;
AltosDescent descent;
AltosLanded landed;
AltosAscent ascent;
AltosDescent descent;
AltosLanded landed;
@@
-45,7
+45,7
@@
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
boolean has_map;
boolean has_companion;
boolean has_state;
boolean has_map;
boolean has_companion;
boolean has_state;
- boolean has_ignit
o
r;
+ boolean has_ignit
e
r;
private AltosFlightStatus flightStatus;
private AltosInfoTable flightInfo;
private AltosFlightStatus flightStatus;
private AltosInfoTable flightInfo;
@@
-101,7
+101,7
@@
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
status_update.saved_listener_state = listener_state;
if (state == null)
status_update.saved_listener_state = listener_state;
if (state == null)
- state = new AltosState();
+ state = new AltosState(
new AltosCalData()
);
if (state.state() != Altos.ao_flight_startup) {
if (!has_state) {
if (state.state() != Altos.ao_flight_startup) {
if (!has_state) {
@@
-115,21
+115,20
@@
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
JComponent tab = which_tab(state);
if (tab != cur_tab) {
JComponent tab = which_tab(state);
if (tab != cur_tab) {
- if (cur_tab == pane.getSelectedComponent())
{
+ if (cur_tab == pane.getSelectedComponent())
pane.setSelectedComponent(tab);
pane.setSelectedComponent(tab);
- }
cur_tab = tab;
}
cur_tab = tab;
}
- if (ignit
o
r.should_show(state)) {
- if (!has_ignit
o
r) {
- pane.add("Ignitor", ignit
o
r);
- has_ignit
o
r = true;
+ if (ignit
e
r.should_show(state)) {
+ if (!has_ignit
e
r) {
+ pane.add("Ignitor", ignit
e
r);
+ has_ignit
e
r = true;
}
} else {
}
} else {
- if (has_ignit
o
r) {
- pane.remove(ignit
o
r);
- has_ignit
o
r = false;
+ if (has_ignit
e
r) {
+ pane.remove(ignit
e
r);
+ has_ignit
e
r = false;
}
}
}
}
@@
-145,7
+144,7
@@
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
}
}
}
}
- if (state.gps != null
&& state.gps.connected
) {
+ if (state.gps != null) {
if (!has_map) {
pane.add("Site Map", sitemap);
has_map = true;
if (!has_map) {
pane.add("Site Map", sitemap);
has_map = true;
@@
-272,8
+271,8
@@
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
displays.add(pad);
pane.add("Status", pad);
displays.add(pad);
pane.add("Status", pad);
- ignit
o
r = new AltosIgnitor();
- displays.add(ignit
o
r);
+ ignit
e
r = new AltosIgnitor();
+ displays.add(ignit
e
r);
ascent = new AltosAscent();
displays.add(ascent);
descent = new AltosDescent();
ascent = new AltosAscent();
displays.add(ascent);
descent = new AltosDescent();