projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/cc1111: Add 2400 and 9600 baud telemetry rate support
[fw/altos]
/
altosui
/
AltosFlightUI.java
diff --git
a/altosui/AltosFlightUI.java
b/altosui/AltosFlightUI.java
index e2dc06bd97842182fc35bd3399258f22560a3bd2..5db0ee92864641e273e5ee80c31828ccb195d627 100644
(file)
--- a/
altosui/AltosFlightUI.java
+++ b/
altosui/AltosFlightUI.java
@@
-20,25
+20,31
@@
package altosui;
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
+import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.*;
-import org.altusmetrum.
AltosLib
.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.
altoslib_5
.*;
+import org.altusmetrum.altosuilib
_3
.*;
-public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay
, AltosFontListener
{
+public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
AltosVoice voice;
AltosFlightReader reader;
AltosDisplayThread thread;
AltosVoice voice;
AltosFlightReader reader;
AltosDisplayThread thread;
+ LinkedList<AltosFlightDisplay> displays;
+
JTabbedPane pane;
AltosPad pad;
JTabbedPane pane;
AltosPad pad;
+ AltosIgnitor ignitor;
AltosAscent ascent;
AltosDescent descent;
AltosLanded landed;
AltosCompanionInfo companion;
AltosAscent ascent;
AltosDescent descent;
AltosLanded landed;
AltosCompanionInfo companion;
- Altos
SiteMap
sitemap;
+ Altos
UIMap
sitemap;
boolean has_map;
boolean has_companion;
boolean has_map;
boolean has_companion;
+ boolean has_state;
+ boolean has_ignitor;
private AltosFlightStatus flightStatus;
private AltosInfoTable flightInfo;
private AltosFlightStatus flightStatus;
private AltosInfoTable flightInfo;
@@
-53,6
+59,8
@@
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
return ascent;
if (state.state <= Altos.ao_flight_main)
return descent;
return ascent;
if (state.state <= Altos.ao_flight_main)
return descent;
+ if (state.state == AltosLib.ao_flight_stateless)
+ return descent;
return landed;
}
return landed;
}
@@
-71,76
+79,89
@@
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
}
public void reset() {
}
public void reset() {
- pad.reset();
- ascent.reset();
- descent.reset();
- landed.reset();
- flightInfo.clear();
- sitemap.reset();
- }
-
- public void set_font() {
- pad.set_font();
- ascent.set_font();
- descent.set_font();
- landed.set_font();
- flightStatus.set_font();
- flightInfo.set_font();
- sitemap.set_font();
- companion.set_font();
+ for (AltosFlightDisplay d : displays)
+ d.reset();
}
public void font_size_changed(int font_size) {
}
public void font_size_changed(int font_size) {
- set_font();
+ for (AltosFlightDisplay d : displays)
+ d.font_size_changed(font_size);
}
}
+ public void units_changed(boolean imperial_units) {
+ for (AltosFlightDisplay d : displays)
+ d.units_changed(imperial_units);
+ }
AltosFlightStatusUpdate status_update;
AltosFlightStatusUpdate status_update;
- public void show(AltosState state,
int crc_errors
) {
+ public void show(AltosState state,
AltosListenerState listener_state
) {
status_update.saved_state = state;
status_update.saved_state = state;
+
+ if (state == null)
+ state = new AltosState();
+
+ if (state.state != Altos.ao_flight_startup) {
+ if (!has_state) {
+ pane.setTitleAt(0, "Launch Pad");
+ pane.add(ascent, 1);
+ pane.add(descent, 2);
+ pane.add(landed, 3);
+ has_state = true;
+ }
+ }
+
JComponent tab = which_tab(state);
JComponent tab = which_tab(state);
- try {
- pad.show(state, crc_errors);
- ascent.show(state, crc_errors);
- descent.show(state, crc_errors);
- landed.show(state, crc_errors);
if (tab != cur_tab) {
if (cur_tab == pane.getSelectedComponent()) {
pane.setSelectedComponent(tab);
}
cur_tab = tab;
}
if (tab != cur_tab) {
if (cur_tab == pane.getSelectedComponent()) {
pane.setSelectedComponent(tab);
}
cur_tab = tab;
}
- flightStatus.show(state, crc_errors);
- flightInfo.show(state, crc_errors);
- if (state.data.companion != null) {
+ 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;
+ }
+ }
+
+ if (state.companion != null) {
if (!has_companion) {
pane.add("Companion", companion);
has_companion= true;
}
if (!has_companion) {
pane.add("Companion", companion);
has_companion= true;
}
- companion.show(state, crc_errors);
} else {
if (has_companion) {
pane.remove(companion);
has_companion = false;
}
}
} else {
if (has_companion) {
pane.remove(companion);
has_companion = false;
}
}
+
if (state.gps != null && state.gps.connected) {
if (!has_map) {
pane.add("Site Map", sitemap);
has_map = true;
}
if (state.gps != null && state.gps.connected) {
if (!has_map) {
pane.add("Site Map", sitemap);
has_map = true;
}
- sitemap.show(state, crc_errors);
} else {
if (has_map) {
pane.remove(sitemap);
has_map = false;
}
}
} else {
if (has_map) {
pane.remove(sitemap);
has_map = false;
}
}
- } catch (Exception e) {
- System.out.print("Show exception " + e + "\n");
- e.printStackTrace();
+
+ for (AltosFlightDisplay d : displays) {
+ try {
+ d.show(state, listener_state);
+ } catch (Exception e) {
+ System.out.printf("Exception showing %s\n", d.getName());
+ e.printStackTrace();
+ }
}
}
}
}
@@
-148,16
+169,18
@@
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
exit_on_close = true;
}
exit_on_close = true;
}
- Container bag;
- Altos
FreqList
frequencies;
-
JComboBox
telemetries;
- JLabel telemetry;
+ Container
bag;
+ Altos
UIFreqList
frequencies;
+
AltosUITelemetryList
telemetries;
+ JLabel
telemetry;
ActionListener show_timer;
public AltosFlightUI(AltosVoice in_voice, AltosFlightReader in_reader, final int serial) {
AltosUIPreferences.set_component(this);
ActionListener show_timer;
public AltosFlightUI(AltosVoice in_voice, AltosFlightReader in_reader, final int serial) {
AltosUIPreferences.set_component(this);
+ displays = new LinkedList<AltosFlightDisplay>();
+
voice = in_voice;
reader = in_reader;
voice = in_voice;
reader = in_reader;
@@
-170,8
+193,8
@@
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
/* Stick channel selector at top of table for telemetry monitoring */
if (serial >= 0) {
/* Stick channel selector at top of table for telemetry monitoring */
if (serial >= 0) {
- //
Channel
menu
- frequencies = new AltosFreqList(AltosUIPreferences.frequency(serial));
+ //
Frequency
menu
+ frequencies = new Altos
UI
FreqList(AltosUIPreferences.frequency(serial));
frequencies.set_product("Monitor");
frequencies.set_serial(serial);
frequencies.addActionListener(new ActionListener() {
frequencies.set_product("Monitor");
frequencies.set_serial(serial);
frequencies.addActionListener(new ActionListener() {
@@
-194,10
+217,10
@@
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
c.anchor = GridBagConstraints.WEST;
bag.add (frequencies, c);
c.anchor = GridBagConstraints.WEST;
bag.add (frequencies, c);
- // Telemetry format
menu
+ // Telemetry format
list
if (reader.supports_telemetry(Altos.ao_telemetry_standard)) {
if (reader.supports_telemetry(Altos.ao_telemetry_standard)) {
- telemetries = new JComboBox();
- for (int i = 1; i <= Altos.ao_telemetry_max; i++)
+ telemetries = new JComboBox
<String>
();
+ for (int i = 1; i <= Altos.ao_telemetry_max; i++)
telemetries.addItem(Altos.telemetry_name(i));
int telemetry = AltosPreferences.telemetry(serial);
if (telemetry <= Altos.ao_telemetry_off ||
telemetries.addItem(Altos.telemetry_name(i));
int telemetry = AltosPreferences.telemetry(serial);
if (telemetry <= Altos.ao_telemetry_off ||
@@
-246,6
+269,7
@@
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
/* Flight status is always visible */
flightStatus = new AltosFlightStatus();
/* Flight status is always visible */
flightStatus = new AltosFlightStatus();
+ displays.add(flightStatus);
c.gridx = 0;
c.gridy = 1;
c.fill = GridBagConstraints.HORIZONTAL;
c.gridx = 0;
c.gridy = 1;
c.fill = GridBagConstraints.HORIZONTAL;
@@
-260,24
+284,29
@@
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
pane = new JTabbedPane();
pad = new AltosPad();
pane = new JTabbedPane();
pad = new AltosPad();
- pane.add("Launch Pad", pad);
+ displays.add(pad);
+ pane.add("Status", pad);
+ ignitor = new AltosIgnitor();
+ displays.add(ignitor);
ascent = new AltosAscent();
ascent = new AltosAscent();
- pane.add("Ascent", ascent);
-
+ displays.add(ascent);
descent = new AltosDescent();
descent = new AltosDescent();
- pane.add("Descent", descent);
-
+ displays.add(descent);
landed = new AltosLanded(reader);
landed = new AltosLanded(reader);
-
pane.add("Landed",
landed);
+
displays.add(
landed);
flightInfo = new AltosInfoTable();
flightInfo = new AltosInfoTable();
+ displays.add(flightInfo);
pane.add("Table", new JScrollPane(flightInfo));
companion = new AltosCompanionInfo();
pane.add("Table", new JScrollPane(flightInfo));
companion = new AltosCompanionInfo();
+ displays.add(companion);
has_companion = false;
has_companion = false;
+ has_state = false;
- sitemap = new AltosSiteMap();
+ sitemap = new AltosUIMap();
+ displays.add(sitemap);
has_map = false;
/* Make the tabbed pane use the rest of the window space */
has_map = false;
/* Make the tabbed pane use the rest of the window space */
@@
-292,6
+321,7
@@
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
AltosUIPreferences.register_font_listener(this);
setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
AltosUIPreferences.register_font_listener(this);
+ AltosPreferences.register_units_listener(this);
addWindowListener(new WindowAdapter() {
@Override
addWindowListener(new WindowAdapter() {
@Override
@@
-300,6
+330,7
@@
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
setVisible(false);
dispose();
AltosUIPreferences.unregister_font_listener(AltosFlightUI.this);
setVisible(false);
dispose();
AltosUIPreferences.unregister_font_listener(AltosFlightUI.this);
+ AltosPreferences.unregister_units_listener(AltosFlightUI.this);
if (exit_on_close)
System.exit(0);
}
if (exit_on_close)
System.exit(0);
}