X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosPad.java;h=0eac0ebcf14fece1c02edcf21c61abb8bc210f36;hp=669543472a71ff3074ad823f0e24c562dcc4220e;hb=5a3c5de6657d1c26e52015a8acec0cd05e294cef;hpb=f01096c4b42f9a4720ed0414826c2a283a992545

diff --git a/altosui/AltosPad.java b/altosui/AltosPad.java
index 66954347..0eac0ebc 100644
--- a/altosui/AltosPad.java
+++ b/altosui/AltosPad.java
@@ -18,15 +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.*;
 
 public class AltosPad extends JComponent implements AltosFlightDisplay {
 	GridBagLayout	layout;
@@ -37,11 +30,42 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 		AltosLights	lights;
 
 		void show(AltosState state, int crc_errors) {}
+
 		void reset() {
 			value.setText("");
 			lights.set(false);
 		}
 
+		public void show() {
+			label.setVisible(true);
+			value.setVisible(true);
+			lights.setVisible(true);
+		}
+
+		void show(String s) {
+			show();
+			value.setText(s);
+		}
+
+		void show(String format, double value) {
+			show(String.format(format, value));
+		}
+
+		void show(String format, int value) {
+			show(String.format(format, value));
+		}
+
+		public void hide() {
+			label.setVisible(false);
+			value.setVisible(false);
+			lights.setVisible(false);
+		}
+
+		public void set_font() {
+			label.setFont(Altos.label_font);
+			value.setFont(Altos.value_font);
+		}
+
 		public LaunchStatus (GridBagLayout layout, int y, String text) {
 			GridBagConstraints	c = new GridBagConstraints();
 			c.weighty = 1;
@@ -83,9 +107,38 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 		JTextField	value;
 		void show(AltosState state, int crc_errors) {}
 
+		void show() {
+			label.setVisible(true);
+			value.setVisible(true);
+		}
+
+		void hide() {
+			label.setVisible(false);
+			value.setVisible(false);
+		}
+
+		public void set_font() {
+			label.setFont(Altos.label_font);
+			value.setFont(Altos.value_font);
+		}
+
+		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("");
 		}
+
 		public LaunchValue (GridBagLayout layout, int y, String text) {
 			GridBagConstraints	c = new GridBagConstraints();
 			c.insets = new Insets(Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad);
@@ -115,7 +168,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
 	class Battery extends LaunchStatus {
 		void show (AltosState state, int crc_errors) {
-			value.setText(String.format("%4.2f V", state.battery));
+			show("%4.2f V", state.battery);
 			lights.set(state.battery > 3.7);
 		}
 		public Battery (GridBagLayout layout, int y) {
@@ -127,7 +180,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
 	class Apogee extends LaunchStatus {
 		void show (AltosState state, int crc_errors) {
-			value.setText(String.format("%4.2f V", state.drogue_sense));
+			show("%4.2f V", state.drogue_sense);
 			lights.set(state.drogue_sense > 3.2);
 		}
 		public Apogee (GridBagLayout layout, int y) {
@@ -139,7 +192,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
 	class Main extends LaunchStatus {
 		void show (AltosState state, int crc_errors) {
-			value.setText(String.format("%4.2f V", state.main_sense));
+			show("%4.2f V", state.main_sense);
 			lights.set(state.main_sense > 3.2);
 		}
 		public Main (GridBagLayout layout, int y) {
@@ -149,10 +202,31 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
 	Main main;
 
+	class LoggingReady extends LaunchStatus {
+		void show (AltosState state, int crc_errors) {
+			if (state.data.flight != 0) {
+				if (state.data.state <= Altos.ao_flight_pad)
+					show("Ready to record");
+				else if (state.data.state < Altos.ao_flight_landed)
+					show("Recording data");
+				else
+					show("Recorded data");
+			}
+			else
+				show("Storage full");
+			lights.set(state.data.flight != 0);
+		}
+		public LoggingReady (GridBagLayout layout, int y) {
+			super(layout, y, "On-board Data Logging");
+		}
+	}
+
+	LoggingReady logging_ready;
+
 	class GPSLocked extends LaunchStatus {
 		void show (AltosState state, int crc_errors) {
-			value.setText(String.format("%4d sats", state.gps.nsat));
-			lights.set(state.gps.locked);
+			show("%4d sats", state.gps.nsat);
+			lights.set(state.gps.locked && state.gps.nsat >= 4);
 		}
 		public GPSLocked (GridBagLayout layout, int y) {
 			super (layout, y, "GPS Locked");
@@ -164,9 +238,9 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 	class GPSReady extends LaunchStatus {
 		void show (AltosState state, int crc_errors) {
 			if (state.gps_ready)
-				value.setText("Ready");
+				show("Ready");
 			else
-				value.setText(String.format("Waiting %d", state.gps_waiting));
+				show("Waiting %d", state.gps_waiting);
 			lights.set(state.gps_ready);
 		}
 		public GPSReady (GridBagLayout layout, int y) {
@@ -189,7 +263,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
 	class PadLat extends LaunchValue {
 		void show (AltosState state, int crc_errors) {
-			value.setText(pos(state.pad_lat,"N", "S"));
+			show(pos(state.pad_lat,"N", "S"));
 		}
 		public PadLat (GridBagLayout layout, int y) {
 			super (layout, y, "Pad Latitude");
@@ -200,7 +274,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
 	class PadLon extends LaunchValue {
 		void show (AltosState state, int crc_errors) {
-			value.setText(pos(state.pad_lon,"E", "W"));
+			show(pos(state.pad_lon,"E", "W"));
 		}
 		public PadLon (GridBagLayout layout, int y) {
 			super (layout, y, "Pad Longitude");
@@ -211,7 +285,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
 	class PadAlt extends LaunchValue {
 		void show (AltosState state, int crc_errors) {
-			value.setText(String.format("%4.0f m", state.pad_alt));
+			show("%4.0f m", state.pad_alt);
 		}
 		public PadAlt (GridBagLayout layout, int y) {
 			super (layout, y, "Pad Altitude");
@@ -224,6 +298,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 		battery.reset();
 		apogee.reset();
 		main.reset();
+		logging_ready.reset();
 		gps_locked.reset();
 		gps_ready.reset();
 		pad_lat.reset();
@@ -231,15 +306,41 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 		pad_alt.reset();
 	}
 
+	public void set_font() {
+		battery.set_font();
+		apogee.set_font();
+		main.set_font();
+		logging_ready.set_font();
+		gps_locked.set_font();
+		gps_ready.set_font();
+		pad_lat.set_font();
+		pad_lon.set_font();
+		pad_alt.set_font();
+	}
+	
 	public void show(AltosState state, int crc_errors) {
 		battery.show(state, crc_errors);
-		apogee.show(state, crc_errors);
-		main.show(state, crc_errors);
-		gps_locked.show(state, crc_errors);
-		gps_ready.show(state, crc_errors);
-		pad_lat.show(state, crc_errors);
-		pad_lon.show(state, crc_errors);
+		if (state.drogue_sense == AltosRecord.MISSING)
+			apogee.hide();
+		else
+			apogee.show(state, crc_errors);
+		if (state.main_sense == AltosRecord.MISSING)
+			main.hide();
+		else
+			main.show(state, crc_errors);
+		logging_ready.show(state, crc_errors);
 		pad_alt.show(state, crc_errors);
+		if (state.gps != null && state.gps.connected) {
+			gps_locked.show(state, crc_errors);
+			gps_ready.show(state, crc_errors);
+			pad_lat.show(state, crc_errors);
+			pad_lon.show(state, crc_errors);
+		} else {
+			gps_locked.hide();
+			gps_ready.hide();
+			pad_lat.hide();
+			pad_lon.hide();
+		}
 	}
 
 	public AltosPad() {
@@ -260,10 +361,11 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 		battery = new Battery(layout, 0);
 		apogee = new Apogee(layout, 1);
 		main = new Main(layout, 2);
-		gps_locked = new GPSLocked(layout, 3);
-		gps_ready = new GPSReady(layout, 4);
-		pad_lat = new PadLat(layout, 5);
-		pad_lon = new PadLon(layout, 6);
-		pad_alt = new PadAlt(layout, 7);
+		logging_ready = new LoggingReady(layout, 3);
+		gps_locked = new GPSLocked(layout, 4);
+		gps_ready = new GPSReady(layout, 5);
+		pad_lat = new PadLat(layout, 6);
+		pad_lon = new PadLon(layout, 7);
+		pad_alt = new PadAlt(layout, 8);
 	}
 }