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 <bdale@gag.com>
Signed-off-by: Keith Packard <keithp@keithp.com>

1 files changed, 18 insertions, 10 deletions

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) {