projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Fix Landed tab units
[fw/altos]
/
altosui
/
AltosDescent.java
diff --git
a/altosui/AltosDescent.java
b/altosui/AltosDescent.java
index 2a9e7eef3bf728d834d62b87021da6fd9d71b653..73972b865dfcb6a66eb493441bc966e7019abaf7 100644
(file)
--- a/
altosui/AltosDescent.java
+++ b/
altosui/AltosDescent.java
@@
-27,6
+27,7
@@
import java.util.*;
import java.text.*;
import java.util.prefs.*;
import java.util.concurrent.LinkedBlockingQueue;
import java.text.*;
import java.util.prefs.*;
import java.util.concurrent.LinkedBlockingQueue;
+import org.altusmetrum.AltosLib.*;
public class AltosDescent extends JComponent implements AltosFlightDisplay {
GridBagLayout layout;
public class AltosDescent extends JComponent implements AltosFlightDisplay {
GridBagLayout layout;
@@
-44,6
+45,15
@@
public class AltosDescent extends JComponent implements AltosFlightDisplay {
lights.setVisible(true);
}
lights.setVisible(true);
}
+ void show(String s) {
+ show();
+ value.setText(s);
+ }
+
+ void show(String format, double value) {
+ show(String.format(format, value));
+ }
+
void hide() {
label.setVisible(false);
value.setVisible(false);
void hide() {
label.setVisible(false);
value.setVisible(false);
@@
-55,6
+65,11
@@
public class AltosDescent extends JComponent implements AltosFlightDisplay {
lights.set(false);
}
lights.set(false);
}
+ void set_font() {
+ label.setFont(Altos.label_font);
+ value.setFont(Altos.value_font);
+ }
+
public DescentStatus (GridBagLayout layout, int y, String text) {
GridBagConstraints c = new GridBagConstraints();
c.weighty = 1;
public DescentStatus (GridBagLayout layout, int y, String text) {
GridBagConstraints c = new GridBagConstraints();
c.weighty = 1;
@@
-113,12
+128,22
@@
public class AltosDescent extends JComponent implements AltosFlightDisplay {
value.setVisible(false);
}
value.setVisible(false);
}
+ void show(String v) {
+ show();
+ value.setText(v);
+ }
+
+ void show(AltosUnits units, double v) {
+ show(units.show(8, v));
+ }
+
void show(String format, double v) {
void show(String format, double v) {
-
value.setText
(String.format(format, v));
+
show
(String.format(format, v));
}
}
- void show(String v) {
- value.setText(v);
+ void set_font() {
+ label.setFont(Altos.label_font);
+ value.setFont(Altos.value_font);
}
public DescentValue (GridBagLayout layout, int x, int y, String text) {
}
public DescentValue (GridBagLayout layout, int x, int y, String text) {
@@
-169,6
+194,12
@@
public class AltosDescent extends JComponent implements AltosFlightDisplay {
value2.setVisible(false);
}
value2.setVisible(false);
}
+ void set_font() {
+ label.setFont(Altos.label_font);
+ value1.setFont(Altos.value_font);
+ value2.setFont(Altos.value_font);
+ }
+
abstract void show(AltosState state, int crc_errors);
void show(String v1, String v2) {
abstract void show(AltosState state, int crc_errors);
void show(String v1, String v2) {
@@
-222,7
+253,7
@@
public class AltosDescent extends JComponent implements AltosFlightDisplay {
class Height extends DescentValue {
void show (AltosState state, int crc_errors) {
class Height extends DescentValue {
void show (AltosState state, int crc_errors) {
- show(
"%6.0f m"
, state.height);
+ show(
AltosConvert.height
, state.height);
}
public Height (GridBagLayout layout, int x, int y) {
super (layout, x, y, "Height");
}
public Height (GridBagLayout layout, int x, int y) {
super (layout, x, y, "Height");
@@
-236,7
+267,7
@@
public class AltosDescent extends JComponent implements AltosFlightDisplay {
double speed = state.speed;
if (!state.ascent)
speed = state.baro_speed;
double speed = state.speed;
if (!state.ascent)
speed = state.baro_speed;
- show(
"%6.0f m/s"
, speed);
+ show(
AltosConvert.speed
, speed);
}
public Speed (GridBagLayout layout, int x, int y) {
super (layout, x, y, "Speed");
}
public Speed (GridBagLayout layout, int x, int y) {
super (layout, x, y, "Speed");
@@
-286,8
+317,7
@@
public class AltosDescent extends JComponent implements AltosFlightDisplay {
class Apogee extends DescentStatus {
void show (AltosState state, int crc_errors) {
class Apogee extends DescentStatus {
void show (AltosState state, int crc_errors) {
- show();
- value.setText(String.format("%4.2f V", state.drogue_sense));
+ show("%4.2f V", state.drogue_sense);
lights.set(state.drogue_sense > 3.2);
}
public Apogee (GridBagLayout layout, int y) {
lights.set(state.drogue_sense > 3.2);
}
public Apogee (GridBagLayout layout, int y) {
@@
-299,8
+329,7
@@
public class AltosDescent extends JComponent implements AltosFlightDisplay {
class Main extends DescentStatus {
void show (AltosState state, int crc_errors) {
class Main extends DescentStatus {
void show (AltosState state, int crc_errors) {
- show();
- value.setText(String.format("%4.2f V", state.main_sense));
+ show("%4.2f V", state.main_sense);
lights.set(state.main_sense > 3.2);
}
public Main (GridBagLayout layout, int y) {
lights.set(state.main_sense > 3.2);
}
public Main (GridBagLayout layout, int y) {
@@
-329,7
+358,7
@@
public class AltosDescent extends JComponent implements AltosFlightDisplay {
class Range extends DescentValue {
void show (AltosState state, int crc_errors) {
class Range extends DescentValue {
void show (AltosState state, int crc_errors) {
- show(
"%6.0f m"
, state.range);
+ show(
AltosConvert.distance
, state.range);
}
public Range (GridBagLayout layout, int x, int y) {
super (layout, x, y, "Range");
}
public Range (GridBagLayout layout, int x, int y) {
super (layout, x, y, "Range");
@@
-361,6
+390,18
@@
public class AltosDescent extends JComponent implements AltosFlightDisplay {
apogee.reset();
}
apogee.reset();
}
+ public void set_font() {
+ lat.set_font();
+ lon.set_font();
+ height.set_font();
+ speed.set_font();
+ bearing.set_font();
+ range.set_font();
+ elevation.set_font();
+ main.set_font();
+ apogee.set_font();
+ }
+
public void show(AltosState state, int crc_errors) {
height.show(state, crc_errors);
speed.show(state, crc_errors);
public void show(AltosState state, int crc_errors) {
height.show(state, crc_errors);
speed.show(state, crc_errors);