projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mark master branch as past the 1.5 point
[fw/altos]
/
altosui
/
AltosIdleMonitorUI.java
diff --git
a/altosui/AltosIdleMonitorUI.java
b/altosui/AltosIdleMonitorUI.java
index 62b5056811c9816da25d9060bf162350029aa7b5..67b7a9897717a2aea529ae383916babb946ffdda 100644
(file)
--- a/
altosui/AltosIdleMonitorUI.java
+++ b/
altosui/AltosIdleMonitorUI.java
@@
-24,18
+24,20
@@
import javax.swing.event.*;
import java.io.*;
import java.util.concurrent.*;
import java.util.Arrays;
import java.io.*;
import java.util.concurrent.*;
import java.util.Arrays;
-import org.altusmetrum.altoslib_
4
.*;
-import org.altusmetrum.altosuilib_
2
.*;
+import org.altusmetrum.altoslib_
5
.*;
+import org.altusmetrum.altosuilib_
3
.*;
-public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDisplay, Altos
FontListener, Altos
IdleMonitorListener, DocumentListener {
+public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDisplay, AltosIdleMonitorListener, DocumentListener {
AltosDevice device;
JTabbedPane pane;
AltosPad pad;
AltosInfoTable flightInfo;
AltosFlightStatus flightStatus;
AltosDevice device;
JTabbedPane pane;
AltosPad pad;
AltosInfoTable flightInfo;
AltosFlightStatus flightStatus;
+ AltosIgnitor ignitor;
AltosIdleMonitor thread;
int serial;
boolean remote;
AltosIdleMonitor thread;
int serial;
boolean remote;
+ boolean has_ignitor;
void stop_display() {
if (thread != null) {
void stop_display() {
if (thread != null) {
@@
-56,23
+58,36
@@
public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
flightInfo.clear();
}
flightInfo.clear();
}
- public void
set_font(
) {
- pad.
set_font(
);
- flightInfo.
set_font(
);
+ public void
font_size_changed(int font_size
) {
+ pad.
font_size_changed(font_size
);
+ flightInfo.
font_size_changed(font_size
);
}
}
- public void font_size_changed(int font_size) {
- set_font();
+ public void units_changed(boolean imperial_units) {
+ pad.units_changed(imperial_units);
+ flightInfo.units_changed(imperial_units);
}
AltosFlightStatusUpdate status_update;
public void show(AltosState state, AltosListenerState listener_state) {
status_update.saved_state = state;
}
AltosFlightStatusUpdate status_update;
public void show(AltosState state, AltosListenerState listener_state) {
status_update.saved_state = state;
+ if (ignitor.should_show(state)) {
+ if (!has_ignitor) {
+ pane.add("Ignitor", ignitor);
+ has_ignitor = true;
+ }
+ } else {
+ if (has_ignitor) {
+ pane.remove(ignitor);
+ has_ignitor = false;
+ }
+ }
// try {
pad.show(state, listener_state);
flightStatus.show(state, listener_state);
flightInfo.show(state, listener_state);
// try {
pad.show(state, listener_state);
flightStatus.show(state, listener_state);
flightInfo.show(state, listener_state);
+ ignitor.show(state, listener_state);
// } catch (Exception e) {
// System.out.print("Show exception " + e);
// }
// } catch (Exception e) {
// System.out.print("Show exception " + e);
// }
@@
-88,7
+103,7
@@
public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
}
Container bag;
}
Container bag;
- Altos
FreqList
frequencies;
+ Altos
UIFreqList
frequencies;
JTextField callsign_value;
/* DocumentListener interface methods */
JTextField callsign_value;
/* DocumentListener interface methods */
@@
-185,7
+200,7
@@
public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
/* Stick frequency selector at top of table for telemetry monitoring */
if (remote && serial >= 0) {
// Frequency menu
/* Stick frequency selector at top of table for telemetry monitoring */
if (remote && serial >= 0) {
// Frequency menu
- frequencies = new AltosFreqList(AltosUIPreferences.frequency(serial));
+ frequencies = new Altos
UI
FreqList(AltosUIPreferences.frequency(serial));
frequencies.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
double frequency = frequencies.frequency();
frequencies.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
double frequency = frequencies.frequency();
@@
-221,6
+236,8
@@
public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
flightInfo = new AltosInfoTable();
pane.add("Table", new JScrollPane(flightInfo));
flightInfo = new AltosInfoTable();
pane.add("Table", new JScrollPane(flightInfo));
+ ignitor = new AltosIgnitor();
+
/* Make the tabbed pane use the rest of the window space */
bag.add(pane, constraints(0, 3, GridBagConstraints.BOTH));
/* Make the tabbed pane use the rest of the window space */
bag.add(pane, constraints(0, 3, GridBagConstraints.BOTH));
@@
-234,7
+251,9
@@
public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
try {
disconnect();
} catch (Exception ex) {
try {
disconnect();
} catch (Exception ex) {
- System.out.println(Arrays.toString(ex.getStackTrace()));
+ System.out.printf("Exception %s\n", ex.toString());
+ for (StackTraceElement el : ex.getStackTrace())
+ System.out.printf("%s\n", el.toString());
}
setVisible(false);
dispose();
}
setVisible(false);
dispose();