X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosLanded.java;h=cc2053e0ca5fe7896557241f31e9dc0bb2854424;hp=47aca29dbeb3e48bb690e325101bd5957a3792d6;hb=36197a388a9ba1d1ee4acd96ac0079ad3af9d3d0;hpb=9e1487b1a5db0afd1d23c86d82c60b1c1a62aab0

diff --git a/altosui/AltosLanded.java b/altosui/AltosLanded.java
index 47aca29d..cc2053e0 100644
--- a/altosui/AltosLanded.java
+++ b/altosui/AltosLanded.java
@@ -20,23 +20,16 @@ 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_2.*;
 
 public class AltosLanded extends JComponent implements AltosFlightDisplay, ActionListener {
 	GridBagLayout	layout;
-	Font		label_font;
-	Font		value_font;
 
 	public class LandedValue {
 		JLabel		label;
 		JTextField	value;
-		void show(AltosState state, int crc_errors) {}
+		void show(AltosState state, AltosListenerState listener_state) {}
 
 		void reset() {
 			value.setText("");
@@ -47,23 +40,35 @@ public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio
 			value.setVisible(true);
 		}
 
-		void hide() {
-			label.setVisible(false);
-			value.setVisible(false);
+		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();
-			value.setText(String.format(format, v));
+			show(String.format(format, v));
+		}
+
+		public void set_font() {
+			label.setFont(Altos.label_font);
+			value.setFont(Altos.value_font);
 		}
 
+		void hide() {
+			label.setVisible(false);
+			value.setVisible(false);
+		}
 
 		public LandedValue (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);
@@ -74,7 +79,7 @@ public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio
 			add(label);
 
 			value = new JTextField(Altos.text_width);
-			value.setFont(value_font);
+			value.setFont(Altos.value_font);
 			value.setHorizontalAlignment(SwingConstants.RIGHT);
 			c.gridx = 1; c.gridy = y;
 			c.anchor = GridBagConstraints.WEST;
@@ -97,12 +102,12 @@ public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio
 	}
 
 	class Lat extends LandedValue {
-		void show (AltosState state, int crc_errors) {
+		void show (AltosState state, AltosListenerState listener_state) {
 			show();
-			if (state.gps != null && state.gps.connected)
-				value.setText(pos(state.gps.lat,"N", "S"));
+			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");
@@ -112,12 +117,12 @@ public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio
 	Lat lat;
 
 	class Lon extends LandedValue {
-		void show (AltosState state, int crc_errors) {
+		void show (AltosState state, AltosListenerState listener_state) {
 			show();
-			if (state.gps != null && state.gps.connected)
-				value.setText(pos(state.gps.lon,"E", "W"));
+			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");
@@ -127,12 +132,12 @@ public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio
 	Lon lon;
 
 	class Bearing extends LandedValue {
-		void show (AltosState state, int crc_errors) {
+		void show (AltosState state, AltosListenerState listener_state) {
 			show();
 			if (state.from_pad != null)
 				show("%3.0f°", state.from_pad.bearing);
 			else
-				value.setText("???");
+				show("???");
 		}
 		public Bearing (GridBagLayout layout, int y) {
 			super (layout, y, "Bearing");
@@ -142,12 +147,12 @@ public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio
 	Bearing bearing;
 
 	class Distance extends LandedValue {
-		void show (AltosState state, int crc_errors) {
+		void show (AltosState state, AltosListenerState listener_state) {
 			show();
 			if (state.from_pad != null)
-				show("%6.0f m", state.from_pad.distance);
+				show(AltosConvert.distance, state.from_pad.distance);
 			else
-				value.setText("???");
+				show("???");
 		}
 		public Distance (GridBagLayout layout, int y) {
 			super (layout, y, "Distance");
@@ -157,8 +162,8 @@ public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio
 	Distance distance;
 
 	class Height extends LandedValue {
-		void show (AltosState state, int crc_errors) {
-			show("%6.0f m", state.max_height);
+		void show (AltosState state, AltosListenerState listener_state) {
+			show(AltosConvert.height, state.max_height());
 		}
 		public Height (GridBagLayout layout, int y) {
 			super (layout, y, "Maximum Height");
@@ -168,8 +173,8 @@ public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio
 	Height	height;
 
 	class Speed extends LandedValue {
-		void show (AltosState state, int crc_errors) {
-			show("%6.0f m/s", state.max_speed);
+		void show (AltosState state, AltosListenerState listener_state) {
+			show(AltosConvert.speed, state.max_speed());
 		}
 		public Speed (GridBagLayout layout, int y) {
 			super (layout, y, "Maximum Speed");
@@ -179,8 +184,8 @@ public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio
 	Speed	speed;
 
 	class Accel extends LandedValue {
-		void show (AltosState state, int crc_errors) {
-			show("%6.0f m/s²", state.max_acceleration);
+		void show (AltosState state, AltosListenerState listener_state) {
+			show(AltosConvert.accel, state.max_acceleration());
 		}
 		public Accel (GridBagLayout layout, int y) {
 			super (layout, y, "Maximum Acceleration");
@@ -199,21 +204,31 @@ public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio
 		accel.reset();
 	}
 
-	public void show(AltosState state, int crc_errors) {
+	public void set_font() {
+		lat.set_font();
+		lon.set_font();
+		bearing.set_font();
+		distance.set_font();
+		height.set_font();
+		speed.set_font();
+		accel.set_font();
+	}
+
+	public void show(AltosState state, AltosListenerState listener_state) {
 		if (state.gps != null && state.gps.connected) {
-			bearing.show(state, crc_errors);
-			distance.show(state, crc_errors);
-			lat.show(state, crc_errors);
-			lon.show(state, crc_errors);
+			bearing.show(state, listener_state);
+			distance.show(state, listener_state);
+			lat.show(state, listener_state);
+			lon.show(state, listener_state);
 		} else {
 			bearing.hide();
 			distance.hide();
 			lat.hide();
 			lon.hide();
 		}
-		height.show(state, crc_errors);
-		speed.show(state, crc_errors);
-		accel.show(state, crc_errors);
+		height.show(state, listener_state);
+		speed.show(state, listener_state);
+		accel.show(state, listener_state);
 		if (reader.backing_file() != null)
 			graph.setEnabled(true);
 	}
@@ -229,24 +244,24 @@ public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio
 			if (file != null) {
 				String	filename = file.getName();
 				try {
-					AltosRecordIterable records = null;
+					AltosStateIterable states = null;
 					if (filename.endsWith("eeprom")) {
 						FileInputStream in = new FileInputStream(file);
-						records = new AltosEepromIterable(in);
+						states = new AltosEepromFile(in);
 					} else if (filename.endsWith("telem")) {
 						FileInputStream in = new FileInputStream(file);
-						records = new AltosTelemetryIterable(in);
+						states = new AltosTelemetryFile(in);
 					} else {
-						throw new FileNotFoundException();
+						throw new FileNotFoundException(filename);
 					}
 					try {
-						new AltosGraphUI(records);
+						new AltosGraphUI(states, file);
 					} catch (InterruptedException ie) {
 					} catch (IOException ie) {
 					}
 				} catch (FileNotFoundException fe) {
 					JOptionPane.showMessageDialog(null,
-								      filename,
+								      fe.getMessage(),
 								      "Cannot open file",
 								      JOptionPane.ERROR_MESSAGE);
 				}
@@ -254,13 +269,15 @@ public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio
 		}
 	}
 
+	public String getName() {
+		return "Landed";
+	}
+
 	public AltosLanded(AltosFlightReader in_reader) {
 		layout = new GridBagLayout();
 
 		reader = in_reader;
 
-		label_font = new Font("Dialog", Font.PLAIN, 22);
-		value_font = new Font("Monospaced", Font.PLAIN, 22);
 		setLayout(layout);
 
 		/* Elements in descent display */