From 97ab77d548964115e4b41ad5952194fcd1455c96 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Fri, 14 Sep 2012 11:13:02 -0700 Subject: altosui: Fix Landed tab units And clean up the whole flight value reporting code base. It would be nice to create a separate class to make this easier; at present there's a bunch of customization embedded in how values are presented in each tab. Reported by: Bdale Garbee Signed-off-by: Keith Packard --- altosui/AltosDescent.java | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) (limited to 'altosui/AltosDescent.java') diff --git a/altosui/AltosDescent.java b/altosui/AltosDescent.java index 62258814..73972b86 100644 --- a/altosui/AltosDescent.java +++ b/altosui/AltosDescent.java @@ -45,6 +45,15 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay { 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); @@ -119,16 +128,17 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay { value.setVisible(false); } - void show(AltosUnits units, double v) { - value.setText(units.show(8, v)); + void show(String v) { + show(); + value.setText(v); } - void show(String format, double v) { - value.setText(String.format(format, v)); + void show(AltosUnits units, double v) { + show(units.show(8, v)); } - void show(String v) { - value.setText(v); + void show(String format, double v) { + show(String.format(format, v)); } void set_font() { @@ -307,8 +317,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay { 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) { @@ -320,8 +329,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay { 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) { -- cgit v1.2.3 From b898cf0a2abf2b0478d5afc5aca030c6b4c8bd0b Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Fri, 14 Sep 2012 12:59:31 -0700 Subject: altosui: Show over-ground-distance in Descent tab Helps to know where the rocket might land. Signed-off-by: Keith Packard --- altosui/AltosDescent.java | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) (limited to 'altosui/AltosDescent.java') diff --git a/altosui/AltosDescent.java b/altosui/AltosDescent.java index 73972b86..2fe7d544 100644 --- a/altosui/AltosDescent.java +++ b/altosui/AltosDescent.java @@ -315,6 +315,19 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay { Lon lon; + class Distance extends DescentValue { + void show(AltosState state, int crc_errors) { + show(AltosConvert.distance, state.from_pad.distance); + } + + 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("%4.2f V", state.drogue_sense); @@ -385,6 +398,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay { speed.reset(); bearing.reset(); range.reset(); + distance.reset(); elevation.reset(); main.reset(); apogee.reset(); @@ -397,6 +411,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay { speed.set_font(); bearing.set_font(); range.set_font(); + distance.set_font(); elevation.set_font(); main.set_font(); apogee.set_font(); @@ -408,12 +423,14 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay { 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(); @@ -439,10 +456,11 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay { 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); } } -- cgit v1.2.3