X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosAscent.java;h=1d9af54679d4f637a82aadb7d32306eed069337d;hp=38b3b30fe8cec9ee6ccd79306b0696fd5add6cc9;hb=710343a23c7e6e9c079eafdf3aeea8a40cc2ce61;hpb=3c2f601139d36761de6a8a2210545d082ef16133

diff --git a/altosui/AltosAscent.java b/altosui/AltosAscent.java
index 38b3b30f..1d9af546 100644
--- a/altosui/AltosAscent.java
+++ b/altosui/AltosAscent.java
@@ -18,16 +18,8 @@
 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.*;
+import org.altusmetrum.altoslib_2.*;
 
 public class AltosAscent extends JComponent implements AltosFlightDisplay {
 	GridBagLayout	layout;
@@ -50,7 +42,21 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 			label.setVisible(false);
 		}
 
-		void show(AltosState state, int crc_errors) {}
+		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);
@@ -101,7 +107,7 @@ 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("");
@@ -112,6 +118,19 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 			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);
@@ -155,12 +174,12 @@ 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 = AltosRecord.MISSING;
+			max = AltosLib.MISSING;
 		}
 
 		void set_font() {
@@ -169,14 +188,14 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 			max_value.setFont(Altos.value_font);
 		}
 
-		void show(String format, double v) {
-			if (v == AltosRecord.MISSING) {
+		void show(AltosUnits units, double v) {
+			if (v == AltosLib.MISSING) {
 				value.setText("Missing");
 				max_value.setText("Missing");
 			} else {
-				value.setText(String.format(format, v));
-				if (v > max || max == AltosRecord.MISSING) {
-					max_value.setText(String.format(format, v));
+				value.setText(units.show(8, v));
+				if (v > max || max == AltosLib.MISSING) {
+					max_value.setText(units.show(8, v));
 					max = v;
 				}
 			}
@@ -220,8 +239,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");
@@ -231,11 +250,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");
@@ -245,8 +261,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");
@@ -267,10 +283,9 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 	}
 
 	class Apogee extends AscentStatus {
-		void show (AltosState state, int crc_errors) {
-			show();
-			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 > 3.7);
 		}
 		public Apogee (GridBagLayout layout, int y) {
 			super(layout, y, "Apogee Igniter Voltage");
@@ -280,10 +295,9 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 	Apogee apogee;
 
 	class Main extends AscentStatus {
-		void show (AltosState state, int crc_errors) {
-			show();
-			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 > 3.7);
 		}
 		public Main (GridBagLayout layout, int y) {
 			super(layout, y, "Main Igniter Voltage");
@@ -293,12 +307,11 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 	Main main;
 
 	class Lat extends AscentValue {
-		void show (AltosState state, int crc_errors) {
-			show();
-			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");
@@ -308,12 +321,11 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 	Lat lat;
 
 	class Lon extends AscentValue {
-		void show (AltosState state, int crc_errors) {
-			show();
-			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");
@@ -344,25 +356,25 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 		accel.set_font();
 	}
 
-	public void show(AltosState state, int crc_errors) {
+	public void show(AltosState state, AltosListenerState listener_state) {
 		if (state.gps != null && state.gps.connected) {
-			lat.show(state, crc_errors);
-			lon.show(state, crc_errors);
+			lat.show(state, listener_state);
+			lon.show(state, listener_state);
 		} else {
 			lat.hide();
 			lon.hide();
 		}
-		height.show(state, crc_errors);
-		if (state.main_sense != AltosRecord.MISSING)
-			main.show(state, crc_errors);
+		height.show(state, listener_state);
+		if (state.main_voltage != AltosLib.MISSING)
+			main.show(state, listener_state);
 		else
 			main.hide();
-		if (state.drogue_sense != AltosRecord.MISSING)
-			apogee.show(state, crc_errors);
+		if (state.apogee_voltage != AltosLib.MISSING)
+			apogee.show(state, listener_state);
 		else
 			apogee.hide();
-		speed.show(state, crc_errors);
-		accel.show(state, crc_errors);
+		speed.show(state, listener_state);
+		accel.show(state, listener_state);
 	}
 
 	public void labels(GridBagLayout layout, int y) {
@@ -383,6 +395,10 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 		add(max);
 	}
 
+	public String getName() {
+		return "Ascent";
+	}
+
 	public AltosAscent() {
 		layout = new GridBagLayout();