projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos]
/
altosui
/
AltosPad.java
diff --git
a/altosui/AltosPad.java
b/altosui/AltosPad.java
index 6ef66f7a937484eb11b8a24872dcc44e34d7c3c5..eb08525cff68775ef462eebf7e9ebe4c43c7b1fc 100644
(file)
--- a/
altosui/AltosPad.java
+++ b/
altosui/AltosPad.java
@@
-18,15
+18,8
@@
package altosui;
import java.awt.*;
package altosui;
import java.awt.*;
-import java.awt.event.*;
import javax.swing.*;
import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
-import java.io.*;
-import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
-import java.util.concurrent.LinkedBlockingQueue;
+import org.altusmetrum.altoslib_1.*;
public class AltosPad extends JComponent implements AltosFlightDisplay {
GridBagLayout layout;
public class AltosPad extends JComponent implements AltosFlightDisplay {
GridBagLayout layout;
@@
-37,6
+30,7
@@
public class AltosPad extends JComponent implements AltosFlightDisplay {
AltosLights lights;
void show(AltosState state, int crc_errors) {}
AltosLights lights;
void show(AltosState state, int crc_errors) {}
+
void reset() {
value.setText("");
lights.set(false);
void reset() {
value.setText("");
lights.set(false);
@@
-48,6
+42,19
@@
public class AltosPad 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 show(String format, int value) {
+ show(String.format(format, value));
+ }
+
public void hide() {
label.setVisible(false);
value.setVisible(false);
public void hide() {
label.setVisible(false);
value.setVisible(false);
@@
-59,6
+66,10
@@
public class AltosPad extends JComponent implements AltosFlightDisplay {
value.setFont(Altos.value_font);
}
value.setFont(Altos.value_font);
}
+ public void set_label(String text) {
+ label.setText(text);
+ }
+
public LaunchStatus (GridBagLayout layout, int y, String text) {
GridBagConstraints c = new GridBagConstraints();
c.weighty = 1;
public LaunchStatus (GridBagLayout layout, int y, String text) {
GridBagConstraints c = new GridBagConstraints();
c.weighty = 1;
@@
-115,9
+126,27
@@
public class AltosPad extends JComponent implements AltosFlightDisplay {
value.setFont(Altos.value_font);
}
value.setFont(Altos.value_font);
}
+ void show(String s) {
+ show();
+ value.setText(s);
+ }
+
+ void show(AltosUnits units, double v) {
+ show(units.show(8, v));
+ }
+
+ void show(String format, double v) {
+ show(String.format(format, v));
+ }
+
+ public void set_label(String text) {
+ label.setText(text);
+ }
+
void reset() {
value.setText("");
}
void reset() {
value.setText("");
}
+
public LaunchValue (GridBagLayout layout, int y, String text) {
GridBagConstraints c = new GridBagConstraints();
c.insets = new Insets(Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad);
public LaunchValue (GridBagLayout layout, int y, String text) {
GridBagConstraints c = new GridBagConstraints();
c.insets = new Insets(Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad);
@@
-147,8
+176,12
@@
public class AltosPad extends JComponent implements AltosFlightDisplay {
class Battery extends LaunchStatus {
void show (AltosState state, int crc_errors) {
class Battery extends LaunchStatus {
void show (AltosState state, int crc_errors) {
- value.setText(String.format("%4.2f V", state.battery));
- lights.set(state.battery > 3.7);
+ if (state.battery == AltosRecord.MISSING)
+ hide();
+ else {
+ show("%4.2f V", state.battery);
+ lights.set(state.battery > 3.7);
+ }
}
public Battery (GridBagLayout layout, int y) {
super(layout, y, "Battery Voltage");
}
public Battery (GridBagLayout layout, int y) {
super(layout, y, "Battery Voltage");
@@
-159,8
+192,7
@@
public class AltosPad extends JComponent implements AltosFlightDisplay {
class Apogee extends LaunchStatus {
void show (AltosState state, int crc_errors) {
class Apogee extends LaunchStatus {
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) {
@@
-172,8
+204,7
@@
public class AltosPad extends JComponent implements AltosFlightDisplay {
class Main extends LaunchStatus {
void show (AltosState state, int crc_errors) {
class Main extends LaunchStatus {
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) {
@@
-185,17
+216,16
@@
public class AltosPad extends JComponent implements AltosFlightDisplay {
class LoggingReady extends LaunchStatus {
void show (AltosState state, int crc_errors) {
class LoggingReady extends LaunchStatus {
void show (AltosState state, int crc_errors) {
- show();
if (state.data.flight != 0) {
if (state.data.state <= Altos.ao_flight_pad)
if (state.data.flight != 0) {
if (state.data.state <= Altos.ao_flight_pad)
-
value.setText
("Ready to record");
+
show
("Ready to record");
else if (state.data.state < Altos.ao_flight_landed)
else if (state.data.state < Altos.ao_flight_landed)
-
value.setText
("Recording data");
+
show
("Recording data");
else
else
-
value.setText
("Recorded data");
+
show
("Recorded data");
}
else
}
else
-
value.setText
("Storage full");
+
show
("Storage full");
lights.set(state.data.flight != 0);
}
public LoggingReady (GridBagLayout layout, int y) {
lights.set(state.data.flight != 0);
}
public LoggingReady (GridBagLayout layout, int y) {
@@
-207,8
+237,7
@@
public class AltosPad extends JComponent implements AltosFlightDisplay {
class GPSLocked extends LaunchStatus {
void show (AltosState state, int crc_errors) {
class GPSLocked extends LaunchStatus {
void show (AltosState state, int crc_errors) {
- show();
- value.setText(String.format("%4d sats", state.gps.nsat));
+ show("%4d sats", state.gps.nsat);
lights.set(state.gps.locked && state.gps.nsat >= 4);
}
public GPSLocked (GridBagLayout layout, int y) {
lights.set(state.gps.locked && state.gps.nsat >= 4);
}
public GPSLocked (GridBagLayout layout, int y) {
@@
-220,11
+249,10
@@
public class AltosPad extends JComponent implements AltosFlightDisplay {
class GPSReady extends LaunchStatus {
void show (AltosState state, int crc_errors) {
class GPSReady extends LaunchStatus {
void show (AltosState state, int crc_errors) {
- show();
if (state.gps_ready)
if (state.gps_ready)
-
value.setText
("Ready");
+
show
("Ready");
else
else
-
value.setText(String.format("Waiting %d", state.gps_waiting)
);
+
show("Waiting %d", state.gps_waiting
);
lights.set(state.gps_ready);
}
public GPSReady (GridBagLayout layout, int y) {
lights.set(state.gps_ready);
}
public GPSReady (GridBagLayout layout, int y) {
@@
-247,8
+275,13
@@
public class AltosPad extends JComponent implements AltosFlightDisplay {
class PadLat extends LaunchValue {
void show (AltosState state, int crc_errors) {
class PadLat extends LaunchValue {
void show (AltosState state, int crc_errors) {
- show();
- value.setText(pos(state.pad_lat,"N", "S"));
+ if (state.state < AltosLib.ao_flight_pad && state.gps != null) {
+ show(pos(state.gps.lat,"N", "S"));
+ set_label("Latitude");
+ } else {
+ show(pos(state.pad_lat,"N", "S"));
+ set_label("Pad Latitude");
+ }
}
public PadLat (GridBagLayout layout, int y) {
super (layout, y, "Pad Latitude");
}
public PadLat (GridBagLayout layout, int y) {
super (layout, y, "Pad Latitude");
@@
-259,8
+292,13
@@
public class AltosPad extends JComponent implements AltosFlightDisplay {
class PadLon extends LaunchValue {
void show (AltosState state, int crc_errors) {
class PadLon extends LaunchValue {
void show (AltosState state, int crc_errors) {
- show();
- value.setText(pos(state.pad_lon,"E", "W"));
+ if (state.state < AltosLib.ao_flight_pad && state.gps != null) {
+ show(pos(state.gps.lon,"E", "W"));
+ set_label("Longitude");
+ } else {
+ show(pos(state.pad_lon,"E", "W"));
+ set_label("Pad Longitude");
+ }
}
public PadLon (GridBagLayout layout, int y) {
super (layout, y, "Pad Longitude");
}
public PadLon (GridBagLayout layout, int y) {
super (layout, y, "Pad Longitude");
@@
-271,7
+309,17
@@
public class AltosPad extends JComponent implements AltosFlightDisplay {
class PadAlt extends LaunchValue {
void show (AltosState state, int crc_errors) {
class PadAlt extends LaunchValue {
void show (AltosState state, int crc_errors) {
- value.setText(String.format("%4.0f m", state.pad_alt));
+ if (state.state < AltosLib.ao_flight_pad && state.gps != null) {
+ show("%4.0f m", state.gps.alt);
+ set_label("Altitude");
+ } else {
+ if (state.pad_alt == AltosRecord.MISSING)
+ hide();
+ else {
+ show("%4.0f m", state.pad_alt);
+ set_label("Pad Altitude");
+ }
+ }
}
public PadAlt (GridBagLayout layout, int y) {
super (layout, y, "Pad Altitude");
}
public PadAlt (GridBagLayout layout, int y) {
super (layout, y, "Pad Altitude");