X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosAscent.java;h=36871dd6e23e4867323979685c202ace9fb1e0d2;hp=64bdcf3097cc5eae63ad395e96eded6ef6ad4a9f;hb=9cb10d73fee0e3f36c778fd2a9c9992b87669fe2;hpb=3fbefb3eea981d34a09496cf8abf0119de2e35bf

diff --git a/altosui/AltosAscent.java b/altosui/AltosAscent.java
index 64bdcf30..36871dd6 100644
--- a/altosui/AltosAscent.java
+++ b/altosui/AltosAscent.java
@@ -18,30 +18,55 @@
 package altosui;
 
 import java.awt.*;
-import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
-import java.io.*;
-import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
-import java.util.concurrent.LinkedBlockingQueue;
+import org.altusmetrum.altoslib_3.*;
 
 public class AltosAscent extends JComponent implements AltosFlightDisplay {
 	GridBagLayout	layout;
+	JLabel			cur, max;
 
 	public class AscentStatus {
 		JLabel		label;
 		JTextField	value;
 		AltosLights	lights;
 
-		void show(AltosState state, int crc_errors) {}
+		void show() {
+			value.setVisible(true);
+			lights.setVisible(true);
+			label.setVisible(true);
+		}
+
+		void hide() {
+			value.setVisible(false);
+			lights.setVisible(false);
+			label.setVisible(false);
+		}
+
+		void show(AltosState state, AltosListenerState listener_state) {}
+
+		void show(String s) {
+			show();
+			value.setText(s);
+		}
+		
+		void show(AltosUnits units, double v) {
+			show(units.show(8, v));
+		}
+
+		void show(String format, double v) {
+			show(String.format(format, v));
+		}
+
 		void reset() {
 			value.setText("");
 			lights.set(false);
 		}
 
+		void set_font() {
+			label.setFont(Altos.label_font);
+			value.setFont(Altos.value_font);
+		}
+
 		public AscentStatus (GridBagLayout layout, int y, String text) {
 			GridBagConstraints	c = new GridBagConstraints();
 			c.weighty = 1;
@@ -82,11 +107,39 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 	public class AscentValue {
 		JLabel		label;
 		JTextField	value;
-		void show(AltosState state, int crc_errors) {}
+		void show(AltosState state, AltosListenerState listener_state) {}
 
 		void reset() {
 			value.setText("");
 		}
+
+		void show() {
+			label.setVisible(true);
+			value.setVisible(true);
+		}
+
+		void show(String s) {
+			show();
+			value.setText(s);
+		}
+		
+		void show(AltosUnits units, double v) {
+			show(units.show(8, v));
+		}
+
+		void show(String format, double v) {
+			show(String.format(format, v));
+		}
+
+		void hide() {
+			label.setVisible(false);
+			value.setVisible(false);
+		}
+		void set_font() {
+			label.setFont(Altos.label_font);
+			value.setFont(Altos.value_font);
+		}
+
 		public AscentValue (GridBagLayout layout, int y, String text) {
 			GridBagConstraints	c = new GridBagConstraints();
 			c.weighty = 1;
@@ -121,21 +174,39 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 		JTextField	max_value;
 		double		max;
 
-		void show(AltosState state, int crc_errors) {}
+		void show(AltosState state, AltosListenerState listener_state) {}
 
 		void reset() {
 			value.setText("");
 			max_value.setText("");
-			max = 0;
+			max = AltosLib.MISSING;
 		}
 
-		void show(String format, double v) {
-			value.setText(String.format(format, v));
-			if (v > max) {
-				max_value.setText(String.format(format, v));
-				max = v;
+		void set_font() {
+			label.setFont(Altos.label_font);
+			value.setFont(Altos.value_font);
+			max_value.setFont(Altos.value_font);
+		}
+
+		void show(AltosUnits units, double v) {
+			if (v == AltosLib.MISSING) {
+				value.setText("Missing");
+				max_value.setText("Missing");
+			} else {
+				value.setText(units.show(8, v));
+				if (v > max || max == AltosLib.MISSING) {
+					max_value.setText(units.show(8, v));
+					max = v;
+				}
 			}
 		}
+
+		void hide() {
+			label.setVisible(false);
+			value.setVisible(false);
+			max_value.setVisible(false);
+		}
+
 		public AscentValueHold (GridBagLayout layout, int y, String text) {
 			GridBagConstraints	c = new GridBagConstraints();
 			c.weighty = 1;
@@ -175,8 +246,8 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 
 
 	class Height extends AscentValueHold {
-		void show (AltosState state, int crc_errors) {
-			show("%6.0f m", state.height);
+		void show (AltosState state, AltosListenerState listener_state) {
+			show(AltosConvert.height, state.height());
 		}
 		public Height (GridBagLayout layout, int y) {
 			super (layout, y, "Height");
@@ -186,11 +257,8 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 	Height	height;
 
 	class Speed extends AscentValueHold {
-		void show (AltosState state, int crc_errors) {
-			double speed = state.speed;
-			if (!state.ascent)
-				speed = state.baro_speed;
-			show("%6.0f m/s", speed);
+		void show (AltosState state, AltosListenerState listener_state) {
+			show(AltosConvert.speed, state.speed());
 		}
 		public Speed (GridBagLayout layout, int y) {
 			super (layout, y, "Speed");
@@ -200,8 +268,8 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 	Speed	speed;
 
 	class Accel extends AscentValueHold {
-		void show (AltosState state, int crc_errors) {
-			show("%6.0f m/s²", state.acceleration);
+		void show (AltosState state, AltosListenerState listener_state) {
+			show(AltosConvert.accel, state.acceleration());
 		}
 		public Accel (GridBagLayout layout, int y) {
 			super (layout, y, "Acceleration");
@@ -210,6 +278,17 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 
 	Accel	accel;
 
+	class Orient extends AscentValueHold {
+		void show (AltosState state, AltosListenerState listener_state) {
+			show(AltosConvert.orient, state.orient());
+		}
+		public Orient (GridBagLayout layout, int y) {
+			super (layout, y, "Tilt Angle");
+		}
+	}
+
+	Orient	orient;
+
 	String pos(double p, String pos, String neg) {
 		String	h = pos;
 		if (p < 0) {
@@ -222,9 +301,9 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 	}
 
 	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);
+		void show (AltosState state, AltosListenerState listener_state) {
+			show("%4.2f V", state.apogee_voltage);
+ 			lights.set(state.apogee_voltage >= AltosLib.ao_igniter_good);
 		}
 		public Apogee (GridBagLayout layout, int y) {
 			super(layout, y, "Apogee Igniter Voltage");
@@ -234,9 +313,9 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 	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);
+		void show (AltosState state, AltosListenerState listener_state) {
+			show("%4.2f V", state.main_voltage);
+			lights.set(state.main_voltage >= AltosLib.ao_igniter_good);
 		}
 		public Main (GridBagLayout layout, int y) {
 			super(layout, y, "Main Igniter Voltage");
@@ -246,11 +325,11 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 	Main main;
 
 	class Lat extends AscentValue {
-		void show (AltosState state, int crc_errors) {
-			if (state.gps != null)
-				value.setText(pos(state.gps.lat,"N", "S"));
+		void show (AltosState state, AltosListenerState listener_state) {
+			if (state.gps != null && state.gps.connected && state.gps.lat != AltosLib.MISSING)
+				show(pos(state.gps.lat,"N", "S"));
 			else
-				value.setText("???");
+				show("???");
 		}
 		public Lat (GridBagLayout layout, int y) {
 			super (layout, y, "Latitude");
@@ -260,11 +339,11 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 	Lat lat;
 
 	class Lon extends AscentValue {
-		void show (AltosState state, int crc_errors) {
-			if (state.gps != null)
-				value.setText(pos(state.gps.lon,"E", "W"));
+		void show (AltosState state, AltosListenerState listener_state) {
+			if (state.gps != null && state.gps.connected && state.gps.lon != AltosLib.MISSING)
+				show(pos(state.gps.lon,"E", "W"));
 			else
-				value.setText("???");
+				show("???");
 		}
 		public Lon (GridBagLayout layout, int y) {
 			super (layout, y, "Longitude");
@@ -281,21 +360,49 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 		height.reset();
 		speed.reset();
 		accel.reset();
+		orient.reset();
+	}
+
+	public void set_font() {
+		cur.setFont(Altos.label_font);
+		max.setFont(Altos.label_font);
+		lat.set_font();
+		lon.set_font();
+		main.set_font();
+		apogee.set_font();
+		height.set_font();
+		speed.set_font();
+		accel.set_font();
+		orient.set_font();
 	}
 
-	public void show(AltosState state, int crc_errors) {
-		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);
+	public void show(AltosState state, AltosListenerState listener_state) {
+		if (state.gps != null && state.gps.connected) {
+			lat.show(state, listener_state);
+			lon.show(state, listener_state);
+		} else {
+			lat.hide();
+			lon.hide();
+		}
+		height.show(state, listener_state);
+		if (state.main_voltage != AltosLib.MISSING)
+			main.show(state, listener_state);
+		else
+			main.hide();
+		if (state.apogee_voltage != AltosLib.MISSING)
+			apogee.show(state, listener_state);
+		else
+			apogee.hide();
+		speed.show(state, listener_state);
+		accel.show(state, listener_state);
+		if (state.orient() != AltosLib.MISSING)
+			orient.show(state, listener_state);
+		else
+			orient.hide();
 	}
 
 	public void labels(GridBagLayout layout, int y) {
 		GridBagConstraints	c;
-		JLabel			cur, max;
 
 		cur = new JLabel("Current");
 		cur.setFont(Altos.label_font);
@@ -312,6 +419,10 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 		add(max);
 	}
 
+	public String getName() {
+		return "Ascent";
+	}
+
 	public AltosAscent() {
 		layout = new GridBagLayout();
 
@@ -323,13 +434,15 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 		 * lon
 		 * height
 		 */
-		labels(layout, 0);
-		height = new Height(layout, 1);
-		speed = new Speed(layout, 2);
-		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);
+		int y = 0;
+		labels(layout, y++);
+		height = new Height(layout, y++);
+		speed = new Speed(layout, y++);
+		accel = new Accel(layout, y++);
+		orient = new Orient(layout, y++);
+		lat = new Lat(layout, y++);
+		lon = new Lon(layout, y++);
+		apogee = new Apogee(layout, y++);
+		main = new Main(layout, y++);
 	}
 }