X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosLanded.java;h=9dab52c436098b8ea0f2a8a90bd5a8829d9276d3;hp=5e073f7dce7184ff31ce9a7255c569f75c32e35e;hb=57b4d82dee10b142b820aa306028a288a85214f6;hpb=055f3232decc07e064d596469b81cf9869411c2d

diff --git a/altosui/AltosLanded.java b/altosui/AltosLanded.java
index 5e073f7d..9dab52c4 100644
--- a/altosui/AltosLanded.java
+++ b/altosui/AltosLanded.java
@@ -21,7 +21,7 @@ import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import java.io.*;
-import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altoslib_1.*;
 
 public class AltosLanded extends JComponent implements AltosFlightDisplay, ActionListener {
 	GridBagLayout	layout;
@@ -29,7 +29,7 @@ public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio
 	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("");
@@ -102,7 +102,7 @@ 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) {
 			if (state.gps != null && state.gps.connected)
 				show(pos(state.gps.lat,"N", "S"));
 			else
@@ -116,7 +116,7 @@ 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)
 				show(pos(state.gps.lon,"E", "W"));
@@ -131,7 +131,7 @@ 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);
@@ -146,7 +146,7 @@ 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(AltosConvert.distance, state.from_pad.distance);
@@ -161,7 +161,7 @@ public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio
 	Distance distance;
 
 	class Height extends LandedValue {
-		void show (AltosState state, int crc_errors) {
+		void show (AltosState state, AltosListenerState listener_state) {
 			show(AltosConvert.height, state.max_height);
 		}
 		public Height (GridBagLayout layout, int y) {
@@ -172,7 +172,7 @@ public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio
 	Height	height;
 
 	class Speed extends LandedValue {
-		void show (AltosState state, int crc_errors) {
+		void show (AltosState state, AltosListenerState listener_state) {
 			show(AltosConvert.speed, state.max_speed());
 		}
 		public Speed (GridBagLayout layout, int y) {
@@ -183,7 +183,7 @@ public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio
 	Speed	speed;
 
 	class Accel extends LandedValue {
-		void show (AltosState state, int crc_errors) {
+		void show (AltosState state, AltosListenerState listener_state) {
 			show(AltosConvert.accel, state.max_acceleration);
 		}
 		public Accel (GridBagLayout layout, int y) {
@@ -213,21 +213,21 @@ public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio
 		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) {
-			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);
 	}
@@ -253,11 +253,14 @@ public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio
 					} else if (filename.endsWith("mega")) {
 						FileInputStream in = new FileInputStream(file);
 						records = new AltosEepromMegaIterable(in);
+					} else if (filename.endsWith("mini")) {
+						FileInputStream in = new FileInputStream(file);
+						records = new AltosEepromMiniIterable(in);
 					} else {
 						throw new FileNotFoundException(filename);
 					}
 					try {
-						new AltosGraphUI(records, filename);
+						new AltosGraphUI(records, file);
 					} catch (InterruptedException ie) {
 					} catch (IOException ie) {
 					}
@@ -271,6 +274,10 @@ public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio
 		}
 	}
 
+	public String getName() {
+		return "Landed";
+	}
+
 	public AltosLanded(AltosFlightReader in_reader) {
 		layout = new GridBagLayout();