X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosAscent.java;h=38ced95eeb3593712a734b643f716e09fa1fed9c;hb=8f72f08839346fb225238420324f0edcd070e531;hp=40df7af886f3a35c0393bd78046d7525d4479e87;hpb=b0d31910da592e2f67c47c8fc3e15ce8135d5094;p=fw%2Faltos

diff --git a/ao-tools/altosui/AltosAscent.java b/ao-tools/altosui/AltosAscent.java
index 40df7af8..38ced95e 100644
--- a/ao-tools/altosui/AltosAscent.java
+++ b/ao-tools/altosui/AltosAscent.java
@@ -30,8 +30,53 @@ import java.util.concurrent.LinkedBlockingQueue;
 
 public class AltosAscent extends JComponent implements AltosFlightDisplay {
 	GridBagLayout	layout;
-	Font		label_font;
-	Font		value_font;
+
+	public class AscentStatus {
+		JLabel		label;
+		JTextField	value;
+		AltosLights	lights;
+
+		void show(AltosState state, int crc_errors) {}
+		void reset() {
+			value.setText("");
+			lights.set(false);
+		}
+
+		public AscentStatus (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 AscentValue {
 		JLabel		label;
@@ -43,23 +88,27 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 		}
 		public AscentValue (GridBagLayout layout, 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.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(20);
-			value.setFont(label_font);
+			value = new JTextField(30);
+			value.setFont(Altos.value_font);
 			value.setHorizontalAlignment(SwingConstants.RIGHT);
 			c.gridx = 1; c.gridy = y;
 			c.anchor = GridBagConstraints.WEST;
-			c.fill = GridBagConstraints.HORIZONTAL;
+			c.fill = GridBagConstraints.BOTH;
 			c.gridwidth = 2;
+			c.weightx = 1;
 			layout.setConstraints(value, c);
 			add(value);
 		}
@@ -88,29 +137,36 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 		}
 		public AscentValueHold (GridBagLayout layout, 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.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(10);
-			value.setFont(label_font);
+			value = new JTextField(15);
+			value.setFont(Altos.value_font);
 			value.setHorizontalAlignment(SwingConstants.RIGHT);
 			c.gridx = 1; c.gridy = y;
 			c.anchor = GridBagConstraints.EAST;
+			c.fill = GridBagConstraints.BOTH;
+			c.weightx = 1;
 			layout.setConstraints(value, c);
 			add(value);
 
-			max_value = new JTextField(10);
-			max_value.setFont(label_font);
+			max_value = new JTextField(15);
+			max_value.setFont(Altos.value_font);
 			max_value.setHorizontalAlignment(SwingConstants.RIGHT);
 			c.gridx = 2; c.gridy = y;
 			c.anchor = GridBagConstraints.EAST;
+			c.fill = GridBagConstraints.BOTH;
+			c.weightx = 1;
 			layout.setConstraints(max_value, c);
 			add(max_value);
 		}
@@ -164,6 +220,30 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 		return String.format("%s %4d° %9.6f", h, deg, min);
 	}
 
+	class Apogee extends AscentStatus {
+		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 AscentStatus {
+		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 Lat extends AscentValue {
 		void show (AltosState state, int crc_errors) {
 			if (state.gps != null)
@@ -195,6 +275,8 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 	public void reset() {
 		lat.reset();
 		lon.reset();
+		main.reset();
+		apogee.reset();
 		height.reset();
 		speed.reset();
 		accel.reset();
@@ -204,6 +286,8 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 		lat.show(state, crc_errors);
 		lon.show(state, crc_errors);
 		height.show(state, crc_errors);
+		main.show(state, crc_errors);
+		apogee.show(state, crc_errors);
 		speed.show(state, crc_errors);
 		accel.show(state, crc_errors);
 	}
@@ -213,15 +297,15 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 		JLabel			cur, max;
 
 		cur = new JLabel("Current");
-		cur.setFont(label_font);
+		cur.setFont(Altos.label_font);
 		c = new GridBagConstraints();
 		c.gridx = 1; c.gridy = y;
-		c.insets = new Insets(10, 10, 10, 10);
+		c.insets = new Insets(Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad);
 		layout.setConstraints(cur, c);
 		add(cur);
 
 		max = new JLabel("Maximum");
-		max.setFont(label_font);
+		max.setFont(Altos.label_font);
 		c.gridx = 2; c.gridy = y;
 		layout.setConstraints(max, c);
 		add(max);
@@ -230,8 +314,6 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 	public AltosAscent() {
 		layout = new GridBagLayout();
 
-		label_font = new Font("Dialog", Font.PLAIN, 24);
-		value_font = new Font("Monospace", Font.PLAIN, 24);
 		setLayout(layout);
 
 		/* Elements in ascent display:
@@ -246,5 +328,7 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 		accel = new Accel(layout, 3);
 		lat = new Lat(layout, 4);
 		lon = new Lon(layout, 5);
+		apogee = new Apogee(layout, 6);
+		main = new Main(layout, 7);
 	}
 }