X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosDescent.java;h=16ccd458d2524b8d82ce22a4ed0e6f20a116b81d;hb=a08b2a6363c194195db92029743f6612676373ce;hp=56d3e4feeee45db70cd9dbd10d786f44ca5088a4;hpb=75f7698b99a661ed17a91748a99699fa6761772a;p=fw%2Faltos

diff --git a/ao-tools/altosui/AltosDescent.java b/ao-tools/altosui/AltosDescent.java
index 56d3e4fe..16ccd458 100644
--- a/ao-tools/altosui/AltosDescent.java
+++ b/ao-tools/altosui/AltosDescent.java
@@ -30,43 +30,155 @@ 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.gridwidth = 3;
+			c.weightx = 0;
+			layout.setConstraints(label, c);
+			add(label);
+
+			value = new JTextField(Altos.text_width);
+			value.setFont(Altos.value_font);
+			value.setHorizontalAlignment(SwingConstants.RIGHT);
+			c.gridx = 4; c.gridy = y;
+			c.gridwidth = 1;
+			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) {
+		void show(String v) {
+			value.setText(v);
+		}
+
+		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;
+			add(label, c);
+
+			value = new JTextField(Altos.text_width);
+			value.setFont(Altos.value_font);
+			value.setHorizontalAlignment(SwingConstants.RIGHT);
+			c.gridx = x + 2; c.gridy = y;
+			c.gridwidth = 1;
 			c.anchor = GridBagConstraints.WEST;
+			c.fill = GridBagConstraints.BOTH;
+			c.weightx = 1;
+			add(value, c);
+		}
+	}
+
+	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);
 
-			value = new JTextField(30);
-			value.setFont(value_font);
-			value.setHorizontalAlignment(SwingConstants.RIGHT);
-			c.gridx = 1; c.gridy = y;
-			c.gridwidth = 2;
+			value1 = new JTextField(Altos.text_width);
+			value1.setFont(Altos.value_font);
+			value1.setHorizontalAlignment(SwingConstants.RIGHT);
+			c.gridx = x + 2; c.gridy = y;
 			c.anchor = GridBagConstraints.WEST;
-			c.fill = GridBagConstraints.HORIZONTAL;
-			layout.setConstraints(value, c);
-			add(value);
+			c.fill = GridBagConstraints.BOTH;
+			c.weightx = 1;
+			layout.setConstraints(value1, c);
+			add(value1);
+
+			value2 = new JTextField(Altos.text_width);
+			value2.setFont(Altos.value_font);
+			value2.setHorizontalAlignment(SwingConstants.RIGHT);
+			c.gridx = x + 4; c.gridy = y;
+			c.anchor = GridBagConstraints.WEST;
+			c.fill = GridBagConstraints.BOTH;
+			c.weightx = 1;
+			c.gridwidth = 1;
+			layout.setConstraints(value2, c);
+			add(value2);
 		}
 	}
 
@@ -74,8 +186,8 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 		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");
 		}
 	}
 
@@ -88,8 +200,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");
 		}
 	}
 
@@ -103,18 +215,18 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 		}
 		int deg = (int) Math.floor(p);
 		double min = (p - Math.floor(p)) * 60.0;
-		return String.format("%s %4d° %9.6f", h, deg, min);
+		return String.format("%s %d° %9.6f", h, deg, min);
 	}
 
 	class Lat extends DescentValue {
 		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"));
 			else
-				value.setText("???");
+				show("???");
 		}
-		public Lat (GridBagLayout layout, int y) {
-			super (layout, y, "Latitude");
+		public Lat (GridBagLayout layout, int x, int y) {
+			super (layout, x, y, "Latitude");
 		}
 	}
 
@@ -123,129 +235,119 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 	class Lon extends DescentValue {
 		void show (AltosState state, int crc_errors) {
 			if (state.gps != null)
-				value.setText(pos(state.gps.lon,"E", "W"));
+				show(pos(state.gps.lon,"W", "E"));
 			else
-				value.setText("???");
+				show("???");
 		}
-		public Lon (GridBagLayout layout, int y) {
-			super (layout, y, "Longitude");
+		public Lon (GridBagLayout layout, int x, int y) {
+			super (layout, x, y, "Longitude");
 		}
 	}
 
 	Lon lon;
 
-	class Bearing {
-		JLabel		label;
-		JTextField	value;
-		JTextField	value_deg;
-        void reset () {
-			value.setText("");
-			value_deg.setText("");
-        }
+	class Apogee 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("???");
-            }
-		}
-		public Bearing (GridBagLayout layout, int y) {
-            GridBagConstraints      c = new GridBagConstraints();
-
-            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;
-            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.fill = GridBagConstraints.HORIZONTAL;
-            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.fill = GridBagConstraints.HORIZONTAL;
-
-            layout.setConstraints(value_deg, c);
-            add(value_deg);
+			value.setText(String.format("%4.2f V", state.drogue_sense));
+			lights.set(state.drogue_sense > 3.2);
+		}
+		public Apogee (GridBagLayout layout, int y) {
+			super(layout, y, "Apogee Igniter Voltage");
 		}
 	}
 
-	Bearing bearing;
+	Apogee apogee;
 
-	class Elevation extends DescentValue {
+	class Main extends DescentStatus {
 		void show (AltosState state, int crc_errors) {
-			if (state.from_pad != null)
-				show("%3.0f°", state.elevation);
-			else
-				value.setText("???");
+			value.setText(String.format("%4.2f V", state.main_sense));
+			lights.set(state.main_sense > 3.2);
 		}
-		public Elevation (GridBagLayout layout, int y) {
-			super (layout, y, "Elevation");
+		public Main (GridBagLayout layout, int y) {
+			super(layout, y, "Main Igniter Voltage");
 		}
 	}
 
-	Elevation elevation;
+	Main main;
+
+	class Bearing extends DescentDualValue {
+		void show (AltosState state, int crc_errors) {
+			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");
+		}
+	}
+
+	Bearing bearing;
 
 	class Range extends DescentValue {
 		void show (AltosState state, int crc_errors) {
 			show("%6.0f m", state.range);
 		}
-		public Range (GridBagLayout layout, int y) {
-			super (layout, y, "Range");
+		public Range (GridBagLayout layout, int x, int y) {
+			super (layout, x, y, "Range");
 		}
 	}
 
 	Range range;
 
+	class Elevation extends DescentValue {
+		void show (AltosState state, int crc_errors) {
+			show("%3.0f°", state.elevation);
+		}
+		public Elevation (GridBagLayout layout, int x, int y) {
+			super (layout, x, y, "Elevation");
+		}
+	}
+
+	Elevation elevation;
+
 	public void reset() {
 		lat.reset();
 		lon.reset();
 		height.reset();
 		speed.reset();
 		bearing.reset();
-		elevation.reset();
 		range.reset();
+		elevation.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);
+		elevation.show(state, crc_errors);
 		lat.show(state, crc_errors);
 		lon.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, 2, 0);
+		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);
+
+		apogee = new Apogee(layout, 4);
+		main = new Main(layout, 5);
 	}
 }