projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Lock access to preferences data
[fw/altos]
/
altosui
/
AltosDescent.java
diff --git
a/altosui/AltosDescent.java
b/altosui/AltosDescent.java
index 594a7a09bb68cc71e9fd025b93134439fb434e94..62258814552fb9123adaecea57ff94721c5c936a 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;
@@
-39,15
+40,15
@@
public class AltosDescent extends JComponent implements AltosFlightDisplay {
abstract void show(AltosState state, int crc_errors);
void show() {
abstract void show(AltosState state, int crc_errors);
void show() {
- label.s
how(
);
- value.s
how(
);
- lights.s
how(
);
+ label.s
etVisible(true
);
+ value.s
etVisible(true
);
+ lights.s
etVisible(true
);
}
void hide() {
}
void hide() {
- label.
hide(
);
- value.
hide(
);
- lights.
hide(
);
+ label.
setVisible(false
);
+ value.
setVisible(false
);
+ lights.
setVisible(false
);
}
void reset() {
}
void reset() {
@@
-55,6
+56,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;
@@
-104,13
+110,17
@@
public class AltosDescent extends JComponent implements AltosFlightDisplay {
abstract void show(AltosState state, int crc_errors);
void show() {
abstract void show(AltosState state, int crc_errors);
void show() {
- label.s
how(
);
- value.s
how(
);
+ label.s
etVisible(true
);
+ value.s
etVisible(true
);
}
void hide() {
}
void hide() {
- label.hide();
- value.hide();
+ label.setVisible(false);
+ value.setVisible(false);
+ }
+
+ void show(AltosUnits units, double v) {
+ value.setText(units.show(8, v));
}
void show(String format, double v) {
}
void show(String format, double v) {
@@
-121,6
+131,11
@@
public class AltosDescent extends JComponent implements AltosFlightDisplay {
value.setText(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) {
GridBagConstraints c = new GridBagConstraints();
c.weighty = 1;
public DescentValue (GridBagLayout layout, int x, int y, String text) {
GridBagConstraints c = new GridBagConstraints();
c.weighty = 1;
@@
-158,15
+173,21
@@
public class AltosDescent extends JComponent implements AltosFlightDisplay {
}
void show() {
}
void show() {
- label.s
how(
);
- value1.s
how(
);
- value2.s
how(
);
+ label.s
etVisible(true
);
+ value1.s
etVisible(true
);
+ value2.s
etVisible(true
);
}
void hide() {
}
void hide() {
- label.hide();
- value1.hide();
- value2.hide();
+ label.setVisible(false);
+ value1.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);
}
abstract void show(AltosState state, int crc_errors);
@@
-222,7
+243,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
+257,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");
@@
-258,7
+279,7
@@
public class AltosDescent extends JComponent implements AltosFlightDisplay {
class Lat extends DescentValue {
void show (AltosState state, int crc_errors) {
class Lat extends DescentValue {
void show (AltosState state, int crc_errors) {
- if (state.gps != null)
+ if (state.gps != null
&& state.gps.connected
)
show(pos(state.gps.lat,"N", "S"));
else
show("???");
show(pos(state.gps.lat,"N", "S"));
else
show("???");
@@
-272,7
+293,7
@@
public class AltosDescent extends JComponent implements AltosFlightDisplay {
class Lon extends DescentValue {
void show (AltosState state, int crc_errors) {
class Lon extends DescentValue {
void show (AltosState state, int crc_errors) {
- if (state.gps != null)
+ if (state.gps != null
&& state.gps.connected
)
show(pos(state.gps.lon,"W", "E"));
else
show("???");
show(pos(state.gps.lon,"W", "E"));
else
show("???");
@@
-286,6
+307,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));
lights.set(state.drogue_sense > 3.2);
}
value.setText(String.format("%4.2f V", state.drogue_sense));
lights.set(state.drogue_sense > 3.2);
}
@@
-328,7
+350,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");
@@
-360,10
+382,22
@@
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);
- if (state.gps != null) {
+ if (state.gps != null
&& state.gps.connected
) {
bearing.show(state, crc_errors);
range.show(state, crc_errors);
elevation.show(state, crc_errors);
bearing.show(state, crc_errors);
range.show(state, crc_errors);
elevation.show(state, crc_errors);
@@
-376,8
+410,14
@@
public class AltosDescent extends JComponent implements AltosFlightDisplay {
lat.hide();
lon.hide();
}
lat.hide();
lon.hide();
}
- main.show(state, crc_errors);
- apogee.show(state, crc_errors);
+ if (state.main_sense != AltosRecord.MISSING)
+ main.show(state, crc_errors);
+ else
+ main.hide();
+ if (state.drogue_sense != AltosRecord.MISSING)
+ apogee.show(state, crc_errors);
+ else
+ apogee.hide();
}
public AltosDescent() {
}
public AltosDescent() {