X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosDescent.java;h=930b896841c8532751fee6c0bc9cd5434c54edfe;hp=b69e36b676440cdfd9afd74ce04436048f384306;hb=6f8bc2ad20b715343e0510563ab0f14787ef3e07;hpb=11c95f687b1f68d35fa1a0af2c4e7982b8bb226a

diff --git a/ao-tools/altosui/AltosDescent.java b/ao-tools/altosui/AltosDescent.java
index b69e36b6..930b8968 100644
--- a/ao-tools/altosui/AltosDescent.java
+++ b/ao-tools/altosui/AltosDescent.java
@@ -30,42 +30,89 @@ import java.util.concurrent.LinkedBlockingQueue;
 
 public class AltosDescent extends JComponent implements AltosFlightDisplay {
 	GridBagLayout	layout;
-	Font		label_font;
-	Font		value_font;
 
-	public class DescentValue {
+	public abstract class DescentStatus {
 		JLabel		label;
 		JTextField	value;
-		void show(AltosState state, int crc_errors) {}
+		AltosLights	lights;
 
+		abstract void show(AltosState state, int crc_errors);
 		void reset() {
 			value.setText("");
+			lights.set(false);
 		}
 
+		public DescentStatus (GridBagLayout layout, int y, String text) {
+			GridBagConstraints	c = new GridBagConstraints();
+			c.weighty = 1;
+
+			lights = new AltosLights();
+			c.gridx = 0; c.gridy = y;
+			c.anchor = GridBagConstraints.CENTER;
+			c.fill = GridBagConstraints.VERTICAL;
+			c.weightx = 0;
+			layout.setConstraints(lights, c);
+			add(lights);
+
+			label = new JLabel(text);
+			label.setFont(Altos.label_font);
+			label.setHorizontalAlignment(SwingConstants.LEFT);
+			c.gridx = 1; c.gridy = y;
+			c.insets = new Insets(Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad);
+			c.anchor = GridBagConstraints.WEST;
+			c.fill = GridBagConstraints.VERTICAL;
+			c.weightx = 0;
+			layout.setConstraints(label, c);
+			add(label);
+
+			value = new JTextField(15);
+			value.setFont(Altos.value_font);
+			value.setHorizontalAlignment(SwingConstants.RIGHT);
+			c.gridx = 2; c.gridy = y;
+            c.gridwidth = 2;
+			c.anchor = GridBagConstraints.WEST;
+			c.fill = GridBagConstraints.BOTH;
+			c.weightx = 1;
+			layout.setConstraints(value, c);
+			add(value);
+
+		}
+	}
+
+	public abstract class DescentValue {
+		JLabel		label;
+		JTextField	value;
+
+		void reset() {
+			value.setText("");
+		}
+
+		abstract void show(AltosState state, int crc_errors);
+
 		void show(String format, double v) {
 			value.setText(String.format(format, v));
 		}
 
-		public DescentValue (GridBagLayout layout, int y, String text) {
+		public DescentValue (GridBagLayout layout, int x, int y, String text) {
 			GridBagConstraints	c = new GridBagConstraints();
 			c.weighty = 1;
 
 			label = new JLabel(text);
-			label.setFont(label_font);
+			label.setFont(Altos.label_font);
 			label.setHorizontalAlignment(SwingConstants.LEFT);
-			c.gridx = 0; c.gridy = y;
-			c.insets = new Insets(10, 10, 10, 10);
+			c.gridx = x + 1; c.gridy = y;
+			c.insets = new Insets(Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad);
 			c.anchor = GridBagConstraints.WEST;
 			c.fill = GridBagConstraints.VERTICAL;
 			c.weightx = 0;
 			layout.setConstraints(label, c);
 			add(label);
 
-			value = new JTextField(30);
-			value.setFont(value_font);
+			value = new JTextField(17);
+			value.setFont(Altos.value_font);
 			value.setHorizontalAlignment(SwingConstants.RIGHT);
-			c.gridx = 1; c.gridy = y;
-			c.gridwidth = 2;
+			c.gridx = x + 2; c.gridy = y;
+            c.gridwidth = 2;
 			c.anchor = GridBagConstraints.WEST;
 			c.fill = GridBagConstraints.BOTH;
 			c.weightx = 1;
@@ -74,12 +121,69 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 		}
 	}
 
+	public abstract class DescentDualValue {
+		JLabel		label;
+		JTextField	value1;
+		JTextField	value2;
+
+		void reset() {
+			value1.setText("");
+			value2.setText("");
+		}
+
+		abstract void show(AltosState state, int crc_errors);
+		void show(String v1, String v2) {
+            value1.setText(v1);
+            value2.setText(v2);
+        }
+		void show(String f1, double v1, String f2, double v2) {
+			value1.setText(String.format(f1, v1));
+			value2.setText(String.format(f2, v2));
+		}
+
+		public DescentDualValue (GridBagLayout layout, int x, int y, String text) {
+			GridBagConstraints	c = new GridBagConstraints();
+			c.weighty = 1;
+
+			label = new JLabel(text);
+			label.setFont(Altos.label_font);
+			label.setHorizontalAlignment(SwingConstants.LEFT);
+			c.gridx = x + 1; c.gridy = y;
+			c.insets = new Insets(Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad);
+			c.anchor = GridBagConstraints.WEST;
+			c.fill = GridBagConstraints.VERTICAL;
+			c.weightx = 0;
+			layout.setConstraints(label, c);
+			add(label);
+
+			value1 = new JTextField(17);
+			value1.setFont(Altos.value_font);
+			value1.setHorizontalAlignment(SwingConstants.RIGHT);
+			c.gridx = x + 2; c.gridy = y;
+			c.anchor = GridBagConstraints.WEST;
+			c.fill = GridBagConstraints.BOTH;
+			c.weightx = 1;
+			layout.setConstraints(value1, c);
+			add(value1);
+
+			value2 = new JTextField(17);
+			value2.setFont(Altos.value_font);
+			value2.setHorizontalAlignment(SwingConstants.RIGHT);
+			c.gridx = x + 3; c.gridy = y;
+			c.anchor = GridBagConstraints.WEST;
+			c.fill = GridBagConstraints.BOTH;
+			c.weightx = 1;
+			layout.setConstraints(value2, c);
+			add(value2);
+		}
+	}
+
 	class Height extends DescentValue {
 		void show (AltosState state, int crc_errors) {
 			show("%6.0f m", state.height);
 		}
-		public Height (GridBagLayout layout, int y) {
-			super (layout, y, "Height");
+		public Height (GridBagLayout layout, int x, int y) {
+			super (layout, x, y, "Height");
 		}
 	}
 
@@ -92,8 +196,8 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 				speed = state.baro_speed;
 			show("%6.0f m/s", speed);
 		}
-		public Speed (GridBagLayout layout, int y) {
-			super (layout, y, "Speed");
+		public Speed (GridBagLayout layout, int x, int y) {
+			super (layout, x, y, "Speed");
 		}
 	}
 
@@ -110,150 +214,107 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 		return String.format("%s %4d° %9.6f", h, deg, min);
 	}
 
-	class Lat extends DescentValue {
+	class LatLon extends DescentDualValue {
 		void show (AltosState state, int crc_errors) {
 			if (state.gps != null)
-				value.setText(pos(state.gps.lat,"N", "S"));
+                show(pos(state.gps.lat,"N", "S"),
+                        pos(state.gps.lon,"W", "E"));
 			else
-				value.setText("???");
+				show("???", "???");
 		}
-		public Lat (GridBagLayout layout, int y) {
-			super (layout, y, "Latitude");
+		public LatLon (GridBagLayout layout, int x, int y) {
+			super (layout, x, y, "Latitude, Longitude");
 		}
 	}
 
-	Lat lat;
+	LatLon latlon;
 
-	class Lon extends DescentValue {
+	class Apogee extends DescentStatus {
 		void show (AltosState state, int crc_errors) {
-			if (state.gps != null)
-				value.setText(pos(state.gps.lon,"E", "W"));
-			else
-				value.setText("???");
+			value.setText(String.format("%4.2f V", state.drogue_sense));
+			lights.set(state.drogue_sense > 3.2);
 		}
-		public Lon (GridBagLayout layout, int y) {
-			super (layout, y, "Longitude");
+		public Apogee (GridBagLayout layout, int y) {
+			super(layout, y, "Apogee Igniter Voltage");
 		}
 	}
 
-	Lon lon;
+	Apogee apogee;
 
-	class Bearing {
-		JLabel		label;
-		JTextField	value;
-		JTextField	value_deg;
-		void reset () {
-			value.setText("");
-			value_deg.setText("");
-		}
+	class Main extends DescentStatus {
 		void show (AltosState state, int crc_errors) {
-			if (state.from_pad != null) {
-				value.setText(state.from_pad.bearing_words(
-						      AltosGreatCircle.BEARING_LONG));
-				value_deg.setText(String.format("%3.0f°", state.from_pad.bearing));
-			} else {
-				value.setText("???");
-				value_deg.setText("???");
-			}
+			value.setText(String.format("%4.2f V", state.main_sense));
+			lights.set(state.main_sense > 3.2);
 		}
-		public Bearing (GridBagLayout layout, int y) {
-			GridBagConstraints      c = new GridBagConstraints();
-			c.weighty = 1;
-
-			label = new JLabel("Bearing");
-			label.setFont(label_font);
-			label.setHorizontalAlignment(SwingConstants.LEFT);
-			c.gridx = 0; c.gridy = y;
-			c.insets = new Insets(10, 10, 10, 10);
-			c.anchor = GridBagConstraints.WEST;
-			c.weightx = 0;
-			c.fill = GridBagConstraints.VERTICAL;
-			layout.setConstraints(label, c);
-			add(label);
-
-			value = new JTextField(30);
-			value.setFont(value_font);
-			value.setHorizontalAlignment(SwingConstants.RIGHT);
-			c.gridx = 1; c.gridy = y;
-			c.anchor = GridBagConstraints.EAST;
-			c.weightx = 1;
-			c.fill = GridBagConstraints.BOTH;
-			layout.setConstraints(value, c);
-			add(value);
-
-			value_deg = new JTextField(5);
-			value_deg.setFont(value_font);
-			value_deg.setHorizontalAlignment(SwingConstants.RIGHT);
-			c.gridx = 2; c.gridy = y;
-			c.anchor = GridBagConstraints.EAST;
-			c.weightx = 1;
-			c.fill = GridBagConstraints.BOTH;
-			layout.setConstraints(value_deg, c);
-			add(value_deg);
+		public Main (GridBagLayout layout, int y) {
+			super(layout, y, "Main Igniter Voltage");
 		}
 	}
 
-	Bearing bearing;
+	Main main;
 
-	class Elevation extends DescentValue {
+	class Bearing extends DescentDualValue {
 		void show (AltosState state, int crc_errors) {
-			if (state.from_pad != null)
-				show("%3.0f°", state.elevation);
-			else
-				value.setText("???");
-		}
-		public Elevation (GridBagLayout layout, int y) {
-			super (layout, y, "Elevation");
+			if (state.from_pad != null) {
+                show( String.format("%3.0f°", state.from_pad.bearing),
+                        state.from_pad.bearing_words(
+                            AltosGreatCircle.BEARING_LONG));
+			} else {
+				show("???", "???");
+			}
 		}
+		public Bearing (GridBagLayout layout, int x, int y) {
+			super (layout, x, y, "Bearing");
+        }
 	}
 
-	Elevation elevation;
+	Bearing bearing;
 
-	class Range extends DescentValue {
+	class Range extends DescentDualValue {
 		void show (AltosState state, int crc_errors) {
-			show("%6.0f m", state.range);
+			show("%6.0f m", state.range,
+                 "%3.0f°", state.elevation);
 		}
-		public Range (GridBagLayout layout, int y) {
-			super (layout, y, "Range");
+		public Range (GridBagLayout layout, int x, int y) {
+			super (layout, x, y, "Range, Elevation");
 		}
 	}
 
 	Range range;
 
 	public void reset() {
-		lat.reset();
-		lon.reset();
+		latlon.reset();
 		height.reset();
 		speed.reset();
 		bearing.reset();
-		elevation.reset();
 		range.reset();
+		main.reset();
+		apogee.reset();
 	}
 
 	public void show(AltosState state, int crc_errors) {
 		height.show(state, crc_errors);
 		speed.show(state, crc_errors);
 		bearing.show(state, crc_errors);
-		elevation.show(state, crc_errors);
 		range.show(state, crc_errors);
-		lat.show(state, crc_errors);
-		lon.show(state, crc_errors);
+		latlon.show(state, crc_errors);
+		main.show(state, crc_errors);
+		apogee.show(state, crc_errors);
 	}
 
 	public AltosDescent() {
 		layout = new GridBagLayout();
 
-		label_font = new Font("Dialog", Font.PLAIN, 24);
-		value_font = new Font("Monospaced", Font.PLAIN, 24);
 		setLayout(layout);
 
 		/* Elements in descent display */
-		speed = new Speed(layout, 0);
-		height = new Height(layout, 1);
-		bearing = new Bearing(layout, 2);
-		elevation = new Elevation(layout, 3);
-		range = new Range(layout, 4);
-		lat = new Lat(layout, 5);
-		lon = new Lon(layout, 6);
+        speed = new Speed(layout, 0, 0);    
+        height = new Height(layout, 0, 1);
+        range = new Range(layout, 0, 2);
+        bearing = new Bearing(layout, 0, 3);
+        latlon = new LatLon(layout, 0, 4);
+
+		apogee = new Apogee(layout, 5);
+		main = new Main(layout, 6);
 	}
 }