projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doc: TeleGPS docs are complete
[fw/altos]
/
altosui
/
AltosIgnitor.java
diff --git
a/altosui/AltosIgnitor.java
b/altosui/AltosIgnitor.java
index 7f79f42bfede9e08e8431a3a073e29d8ef688e59..73318117bc7985152f7c9730c6b081b73661d088 100644
(file)
--- a/
altosui/AltosIgnitor.java
+++ b/
altosui/AltosIgnitor.java
@@
-25,7
+25,7
@@
import org.altusmetrum.altosuilib_2.*;
public class AltosIgnitor extends JComponent implements AltosFlightDisplay {
GridBagLayout layout;
public class AltosIgnitor extends JComponent implements AltosFlightDisplay {
GridBagLayout layout;
- public class LaunchStatus {
+ public class LaunchStatus
implements AltosFontListener, AltosUnitsListener
{
JLabel label;
JTextField value;
AltosLights lights;
JLabel label;
JTextField value;
AltosLights lights;
@@
-66,11
+66,14
@@
public class AltosIgnitor extends JComponent implements AltosFlightDisplay {
hide();
}
hide();
}
- public void
set_font(
) {
+ public void
font_size_changed(int font_size
) {
label.setFont(Altos.label_font);
value.setFont(Altos.value_font);
}
label.setFont(Altos.label_font);
value.setFont(Altos.value_font);
}
+ public void units_changed(boolean imperial_units) {
+ }
+
public void set_label(String text) {
label.setText(text);
}
public void set_label(String text) {
label.setText(text);
}
@@
-99,6
+102,7
@@
public class AltosIgnitor extends JComponent implements AltosFlightDisplay {
add(label);
value = new JTextField(Altos.text_width);
add(label);
value = new JTextField(Altos.text_width);
+ value.setEditable(false);
value.setFont(Altos.value_font);
value.setHorizontalAlignment(SwingConstants.RIGHT);
c.gridx = 2; c.gridy = y;
value.setFont(Altos.value_font);
value.setHorizontalAlignment(SwingConstants.RIGHT);
c.gridx = 2; c.gridy = y;
@@
-111,10
+115,6
@@
public class AltosIgnitor extends JComponent implements AltosFlightDisplay {
}
}
}
}
- public static String ignitor_name(int i) {
- return String.format("Ignitor %c", 'A' + i);
- }
-
class Ignitor extends LaunchStatus {
int ignitor;
class Ignitor extends LaunchStatus {
int ignitor;
@@
-128,7
+128,7
@@
public class AltosIgnitor extends JComponent implements AltosFlightDisplay {
}
public Ignitor (GridBagLayout layout, int y) {
}
public Ignitor (GridBagLayout layout, int y) {
- super(layout, y, String.format ("%s Voltage", ignitor_name(y)));
+ super(layout, y, String.format ("%s Voltage",
AltosLib.
ignitor_name(y)));
ignitor = y;
}
}
ignitor = y;
}
}
@@
-142,11
+142,14
@@
public class AltosIgnitor extends JComponent implements AltosFlightDisplay {
ignitors[i].reset();
}
ignitors[i].reset();
}
- public void
set_font(
) {
+ public void
font_size_changed(int font_size
) {
if (ignitors == null)
return;
for (int i = 0; i < ignitors.length; i++)
if (ignitors == null)
return;
for (int i = 0; i < ignitors.length; i++)
- ignitors[i].set_font();
+ ignitors[i].font_size_changed(font_size);
+ }
+
+ public void units_changed(boolean imperial_units) {
}
public void show(AltosState state, AltosListenerState listener_state) {
}
public void show(AltosState state, AltosListenerState listener_state) {