package altosui;
import java.awt.*;
-import java.awt.event.*;
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.*;
public class AltosDescent extends JComponent implements AltosFlightDisplay {
GridBagLayout layout;
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);
value.setVisible(false);
}
- void show(String format, double v) {
- value.setText(String.format(format, v));
- }
-
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) {
+ show(String.format(format, v));
+ }
+
void set_font() {
label.setFont(Altos.label_font);
value.setFont(Altos.value_font);
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");
class Speed extends DescentValue {
void show (AltosState state, int crc_errors) {
- double speed = state.speed;
+ double speed = state.accel_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");
Lon lon;
+ class Distance extends DescentValue {
+ void show(AltosState state, int crc_errors) {
+ if (state.from_pad != null)
+ show(AltosConvert.distance, state.from_pad.distance);
+ else
+ show("???");
+ }
+
+ public Distance (GridBagLayout layout, int x, int y) {
+ super(layout, x, y, "Ground Distance");
+ }
+ }
+
+ Distance distance;
+
+
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) {
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) {
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");
speed.reset();
bearing.reset();
range.reset();
+ distance.reset();
elevation.reset();
main.reset();
apogee.reset();
speed.set_font();
bearing.set_font();
range.set_font();
+ distance.set_font();
elevation.set_font();
main.set_font();
apogee.set_font();
if (state.gps != null && state.gps.connected) {
bearing.show(state, crc_errors);
range.show(state, crc_errors);
+ distance.show(state, crc_errors);
elevation.show(state, crc_errors);
lat.show(state, crc_errors);
lon.show(state, crc_errors);
} else {
bearing.hide();
range.hide();
+ distance.hide();
elevation.hide();
lat.hide();
lon.hide();
elevation = new Elevation(layout, 0, 1);
range = new Range(layout, 2, 1);
bearing = new Bearing(layout, 0, 2);
- lat = new Lat(layout, 0, 3);
- lon = new Lon(layout, 2, 3);
+ distance = new Distance(layout, 0, 3);
+ lat = new Lat(layout, 0, 4);
+ lon = new Lon(layout, 2, 4);
- apogee = new Apogee(layout, 4);
- main = new Main(layout, 5);
+ apogee = new Apogee(layout, 5);
+ main = new Main(layout, 6);
}
}