X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosDescent.java;h=aacd2998dc4b0cf09c0ceaebd075b59d08cb025f;hp=56d3e4feeee45db70cd9dbd10d786f44ca5088a4;hb=483346a03c94b200692f5e6d59f3feee4dcf2ace;hpb=5394548fa5c7bdbfcc01e8aa19e93e1cf6345e2a

diff --git a/ao-tools/altosui/AltosDescent.java b/ao-tools/altosui/AltosDescent.java
index 56d3e4fe..aacd2998 100644
--- a/ao-tools/altosui/AltosDescent.java
+++ b/ao-tools/altosui/AltosDescent.java
@@ -30,9 +30,53 @@ import java.util.concurrent.LinkedBlockingQueue;
 
 public class AltosDescent extends JComponent implements AltosFlightDisplay {
 	GridBagLayout	layout;
-	Font		label_font;
-	Font		value_font;
 
+	public class DescentStatus {
+		JLabel		label;
+		JTextField	value;
+		AltosLights	lights;
+
+		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.anchor = GridBagConstraints.WEST;
+			c.fill = GridBagConstraints.BOTH;
+			c.weightx = 1;
+			layout.setConstraints(value, c);
+			add(value);
+
+		}
+	}
 	public class DescentValue {
 		JLabel		label;
 		JTextField	value;
@@ -46,25 +90,28 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 			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 + 0; 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 + 1; c.gridy = y;
 			c.anchor = GridBagConstraints.WEST;
-			c.fill = GridBagConstraints.HORIZONTAL;
+			c.fill = GridBagConstraints.BOTH;
+			c.weightx = 1;
 			layout.setConstraints(value, c);
 			add(value);
 		}
@@ -74,8 +121,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 +135,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");
 		}
 	}
 
@@ -113,8 +160,8 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 			else
 				value.setText("???");
 		}
-		public Lat (GridBagLayout layout, int y) {
-			super (layout, y, "Latitude");
+		public Lat (GridBagLayout layout, int x, int y) {
+			super (layout, x, y, "Latitude");
 		}
 	}
 
@@ -127,61 +174,90 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 			else
 				value.setText("???");
 		}
-		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 Apogee extends DescentStatus {
+		void show (AltosState state, int crc_errors) {
+			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");
+		}
+	}
+
+	Apogee apogee;
+
+	class Main extends DescentStatus {
+		void show (AltosState state, int crc_errors) {
+			value.setText(String.format("%4.2f V", state.main_sense));
+			lights.set(state.main_sense > 3.2);
+		}
+		public Main (GridBagLayout layout, int y) {
+			super(layout, y, "Main Igniter Voltage");
+		}
+	}
+
+	Main main;
+
 	class Bearing {
 		JLabel		label;
 		JTextField	value;
 		JTextField	value_deg;
-        void reset () {
+		void reset () {
 			value.setText("");
 			value_deg.setText("");
-        }
+		}
 		void show (AltosState state, int crc_errors) {
 			if (state.from_pad != null) {
-                value.setText(state.from_pad.bearing_words(
-                                AltosGreatCircle.BEARING_LONG));
+				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);
+			}
+		}
+		public Bearing (GridBagLayout layout, int x, int y) {
+			GridBagConstraints      c = new GridBagConstraints();
+			c.weighty = 1;
+
+			label = new JLabel("Bearing");
+			label.setFont(Altos.label_font);
+			label.setHorizontalAlignment(SwingConstants.LEFT);
+			c.gridx = x + 0; 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.weightx = 0;
+			c.fill = GridBagConstraints.VERTICAL;
+			layout.setConstraints(label, c);
+			add(label);
+
+			value = new JTextField(30);
+			value.setFont(Altos.value_font);
+			value.setHorizontalAlignment(SwingConstants.RIGHT);
+			c.gridx = x + 1; c.gridy = y;
+			c.anchor = GridBagConstraints.EAST;
+			c.weightx = 1;
+			c.gridwidth = 2;
+			c.fill = GridBagConstraints.BOTH;
+			layout.setConstraints(value, c);
+			add(value);
+
+			value_deg = new JTextField(5);
+			value_deg.setFont(Altos.value_font);
+			value_deg.setHorizontalAlignment(SwingConstants.RIGHT);
+			c.gridx = x + 3; c.gridy = y;
+			c.anchor = GridBagConstraints.EAST;
+			c.weightx = 1;
+			c.fill = GridBagConstraints.BOTH;
+			layout.setConstraints(value_deg, c);
+			add(value_deg);
 		}
 	}
 
@@ -194,8 +270,8 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 			else
 				value.setText("???");
 		}
-		public Elevation (GridBagLayout layout, int y) {
-			super (layout, y, "Elevation");
+		public Elevation (GridBagLayout layout, int x, int y) {
+			super (layout, x, y, "Elevation");
 		}
 	}
 
@@ -205,8 +281,8 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 		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");
 		}
 	}
 
@@ -220,6 +296,8 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 		bearing.reset();
 		elevation.reset();
 		range.reset();
+		main.reset();
+		apogee.reset();
 	}
 
 	public void show(AltosState state, int crc_errors) {
@@ -230,22 +308,22 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 		range.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, 0, 4);
+		apogee = new Apogee(layout, 5);
+		main = new Main(layout, 6);
 	}
 }