X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosIdleMonitorUI.java;h=b5652df3cffb13d8909f3aa3141727a63f28d931;hp=988a797c963a85cdad456e530d16286983fd7fdc;hb=71715337eb532a1fbe1a753240e7417d5223489f;hpb=3d88e0493ab446d7c7011786390d30618a72d045

diff --git a/altosui/AltosIdleMonitorUI.java b/altosui/AltosIdleMonitorUI.java
index 988a797c..b5652df3 100644
--- a/altosui/AltosIdleMonitorUI.java
+++ b/altosui/AltosIdleMonitorUI.java
@@ -20,242 +20,14 @@ package altosui;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
+import javax.swing.event.*;
 import java.io.*;
-import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
 import java.util.concurrent.*;
+import java.util.Arrays;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;
 
-class AltosADC {
-	int	tick;
-	int	accel;
-	int	pres;
-	int	temp;
-	int	batt;
-	int	drogue;
-	int	main;
-
-	public AltosADC(AltosSerial serial) throws InterruptedException, TimeoutException {
-		serial.printf("a\n");
-		for (;;) {
-			String line = serial.get_reply_no_dialog(5000);
-			if (line == null) {
-				throw new TimeoutException();
-			}
-			if (!line.startsWith("tick:"))
-				continue;
-			String[] items = line.split("\\s+");
-			for (int i = 0; i < items.length;) {
-				if (items[i].equals("tick:")) {
-					tick = Integer.parseInt(items[i+1]);
-					i += 2;
-					continue;
-				}
-				if (items[i].equals("accel:")) {
-					accel = Integer.parseInt(items[i+1]);
-					i += 2;
-					continue;
-				}
-				if (items[i].equals("pres:")) {
-					pres = Integer.parseInt(items[i+1]);
-					i += 2;
-					continue;
-				}
-				if (items[i].equals("temp:")) {
-					temp = Integer.parseInt(items[i+1]);
-					i += 2;
-					continue;
-				}
-				if (items[i].equals("batt:")) {
-					batt = Integer.parseInt(items[i+1]);
-					i += 2;
-					continue;
-				}
-				if (items[i].equals("drogue:")) {
-					drogue = Integer.parseInt(items[i+1]);
-					i += 2;
-					continue;
-				}
-				if (items[i].equals("main:")) {
-					main = Integer.parseInt(items[i+1]);
-					i += 2;
-					continue;
-				}
-			}
-			break;
-		}
-	}
-}
-
-class AltosGPSQuery extends AltosGPS {
-	public AltosGPSQuery (AltosSerial serial) throws TimeoutException, InterruptedException {
-		serial.printf("g\n");
-		for (;;) {
-			String line = serial.get_reply_no_dialog(5000);
-			if (line == null)
-				throw new TimeoutException();
-			String[] bits = line.split("\\s+");
-			if (bits.length == 0)
-				continue;
-			if (line.startsWith("Date:")) {
-				if (bits.length < 2)
-					continue;
-				String[] d = bits[1].split(":");
-				if (d.length < 3)
-					continue;
-				year = Integer.parseInt(d[0]) + 2000;
-				month = Integer.parseInt(d[1]);
-				day = Integer.parseInt(d[2]);
-				continue;
-			}
-			if (line.startsWith("Time:")) {
-				if (bits.length < 2)
-					continue;
-				String[] d = bits[1].split("/");
-				if (d.length < 3)
-					continue;
-				hour = Integer.parseInt(d[0]);
-				minute = Integer.parseInt(d[1]);
-				second = Integer.parseInt(d[2]);
-				continue;
-			}
-			if (line.startsWith("Lat/Lon:")) {
-				if (bits.length < 3)
-					continue;
-				lat = Integer.parseInt(bits[1]) * 1.0e-7;
-				lon = Integer.parseInt(bits[2]) * 1.0e-7;
-				continue;
-			}
-			if (line.startsWith("Alt:")) {
-				if (bits.length < 2)
-					continue;
-				alt = Integer.parseInt(bits[1]);
-				continue;
-			}
-			if (line.startsWith("Flags:")) {
-				if (bits.length < 2)
-					continue;
-				int status = Integer.decode(bits[1]);
-				connected = (status & Altos.AO_GPS_RUNNING) != 0;
-				locked = (status & Altos.AO_GPS_VALID) != 0;
-				continue;
-			}
-			if (line.startsWith("Sats:")) {
-				if (bits.length < 2)
-					continue;
-				nsat = Integer.parseInt(bits[1]);
-				cc_gps_sat = new AltosGPSSat[nsat];
-				for (int i = 0; i < nsat; i++) {
-					int	svid = Integer.parseInt(bits[2+i*2]);
-					int	cc_n0 = Integer.parseInt(bits[3+i*2]);
-					cc_gps_sat[i] = new AltosGPSSat(svid, cc_n0);
-				}
-			}
-			if (line.startsWith("done"))
-				break;
-			if (line.startsWith("Syntax error"))
-				break;
-		}
-	}
-}
-
-class AltosIdleMonitor extends Thread {
-	AltosDevice		device;
-	AltosSerial		serial;
-	AltosIdleMonitorUI	ui;
-	AltosState		state;
-	boolean			remote;
-	double			frequency;
-	AltosState		previous_state;
-	AltosConfigData		config_data;
-	AltosADC		adc;
-	AltosGPS		gps;
-
-	void update_state() throws InterruptedException, TimeoutException {
-		AltosRecord	record = new AltosRecord();
-
-		try {
-			if (remote) {
-				serial.set_radio_frequency(frequency);
-				serial.start_remote();
-			} else
-				serial.flush_input();
-			config_data = new AltosConfigData(serial);
-			adc = new AltosADC(serial);
-			gps = new AltosGPSQuery(serial);
-		} finally {
-			if (remote)
-				serial.stop_remote();
-		}
-
-		record.version = 0;
-		record.callsign = config_data.callsign;
-		record.serial = config_data.serial;
-		record.flight = config_data.log_available() > 0 ? 255 : 0;
-		record.rssi = 0;
-		record.status = 0;
-		record.state = Altos.ao_flight_idle;
-
-		record.tick = adc.tick;
-		record.accel = adc.accel;
-		record.pres = adc.pres;
-		record.batt = adc.batt;
-		record.temp = adc.temp;
-		record.drogue = adc.drogue;
-		record.main = adc.main;
-
-		record.ground_accel = record.accel;
-		record.ground_pres = record.pres;
-		record.accel_plus_g = config_data.accel_cal_plus;
-		record.accel_minus_g = config_data.accel_cal_minus;
-		record.acceleration = 0;
-		record.speed = 0;
-		record.height = 0;
-		record.gps = gps;
-		state = new AltosState (record, state);
-	}
-
-	void set_frequency(double in_frequency) {
-		frequency = in_frequency;
-	}
-
-	public void post_state() {
-		Runnable r = new Runnable() {
-				public void run() {
-					ui.update(state);
-				}
-			};
-		SwingUtilities.invokeLater(r);
-	}
-
-	public void run() {
-		try {
-			for (;;) {
-				try {
-					update_state();
-					post_state();
-				} catch (TimeoutException te) {
-				}
-				Thread.sleep(1000);
-			}
-		} catch (InterruptedException ie) {
-			serial.close();
-		}
-	}
-
-	public AltosIdleMonitor(AltosIdleMonitorUI in_ui, AltosDevice in_device, boolean in_remote)
-		throws FileNotFoundException, AltosSerialInUseException, InterruptedException, TimeoutException {
-		device = in_device;
-		ui = in_ui;
-		serial = new AltosSerial(device);
-		remote = in_remote;
-		state = null;
-	}
-}
-
-public class AltosIdleMonitorUI extends JFrame implements AltosFlightDisplay {
+public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDisplay, AltosFontListener, AltosIdleMonitorListener, DocumentListener {
 	AltosDevice		device;
 	JTabbedPane		pane;
 	AltosPad		pad;
@@ -266,11 +38,11 @@ public class AltosIdleMonitorUI extends JFrame implements AltosFlightDisplay {
 	boolean			remote;
 
 	void stop_display() {
-		if (thread != null && thread.isAlive()) {
-			thread.interrupt();
+		if (thread != null) {
 			try {
-				thread.join();
-			} catch (InterruptedException ie) {}
+				thread.abort();
+			} catch (InterruptedException ie) {
+			}
 		}
 		thread = null;
 	}
@@ -289,72 +61,154 @@ public class AltosIdleMonitorUI extends JFrame implements AltosFlightDisplay {
 		flightInfo.set_font();
 	}
 
-	public void show(AltosState state, int crc_errors) {
-		try {
-			pad.show(state, crc_errors);
-			flightStatus.show(state, crc_errors);
-			flightInfo.show(state, crc_errors);
-		} catch (Exception e) {
-			System.out.print("Show exception" + e);
-		}
+	public void font_size_changed(int font_size) {
+		set_font();
 	}
 
-	public void update(AltosState state) {
-		show (state, 0);
+	AltosFlightStatusUpdate	status_update;
+
+	public void show(AltosState state, AltosListenerState listener_state) {
+		status_update.saved_state = state;
+//		try {
+			pad.show(state, listener_state);
+			flightStatus.show(state, listener_state);
+			flightInfo.show(state, listener_state);
+//		} catch (Exception e) {
+//			System.out.print("Show exception " + e);
+//		}
+	}
+
+	public void update(final AltosState state, final AltosListenerState listener_state) {
+		Runnable r = new Runnable() {
+				public void run() {
+					show(state, listener_state);
+				}
+			};
+		SwingUtilities.invokeLater(r);
 	}
 
 	Container	bag;
 	AltosFreqList	frequencies;
+	JTextField	callsign_value;
+
+	/* DocumentListener interface methods */
+	public void changedUpdate(DocumentEvent e) {
+		if (callsign_value != null) {
+			String	callsign = callsign_value.getText();
+			thread.set_callsign(callsign);
+			AltosUIPreferences.set_callsign(callsign);
+		}
+	}
+
+	public void insertUpdate(DocumentEvent e) {
+		changedUpdate(e);
+	}
+
+	public void removeUpdate(DocumentEvent e) {
+		changedUpdate(e);
+	}
+
+	int row = 0;
+
+	public GridBagConstraints constraints (int x, int width, int fill) {
+		GridBagConstraints c = new GridBagConstraints();
+		Insets insets = new Insets(4, 4, 4, 4);
+
+		c.insets = insets;
+		c.fill = fill;
+		if (width == 3)
+			c.anchor = GridBagConstraints.CENTER;
+		else if (x == 2)
+			c.anchor = GridBagConstraints.EAST;
+		else
+			c.anchor = GridBagConstraints.WEST;
+		c.gridx = x;
+		c.gridwidth = width;
+		c.gridy = row;
+		return c;
+	}
+
+	public GridBagConstraints constraints(int x, int width) {
+		return constraints(x, width, GridBagConstraints.NONE);
+	}
+
+	void idle_exception(JFrame owner, Exception e) {
+		if (e instanceof FileNotFoundException) {
+			JOptionPane.showMessageDialog(owner,
+						      ((FileNotFoundException) e).getMessage(),
+						      "Cannot open target device",
+						      JOptionPane.ERROR_MESSAGE);
+		} else if (e instanceof AltosSerialInUseException) {
+			JOptionPane.showMessageDialog(owner,
+						      String.format("Device \"%s\" already in use",
+								    device.toShortString()),
+						      "Device in use",
+						      JOptionPane.ERROR_MESSAGE);
+		} else if (e instanceof IOException) {
+			IOException ee = (IOException) e;
+			JOptionPane.showMessageDialog(owner,
+						      device.toShortString(),
+						      ee.getLocalizedMessage(),
+						      JOptionPane.ERROR_MESSAGE);
+		} else {
+			JOptionPane.showMessageDialog(owner,
+						      String.format("Connection to \"%s\" failed",
+								    device.toShortString()),
+						      "Connection Failed",
+						      JOptionPane.ERROR_MESSAGE);
+		}
+	}
 
 	public AltosIdleMonitorUI(JFrame in_owner)
-		throws FileNotFoundException, AltosSerialInUseException, TimeoutException, InterruptedException {
+		throws FileNotFoundException, TimeoutException, InterruptedException {
 
-		device = AltosDeviceDialog.show(in_owner, Altos.product_any);
+		device = AltosDeviceUIDialog.show(in_owner, Altos.product_any);
 		remote = false;
-		if (!device.matchProduct(Altos.product_telemetrum))
+		if (!device.matchProduct(Altos.product_altimeter))
 			remote = true;
 
 		serial = device.getSerial();
-		bag = getContentPane();
-		bag.setLayout(new GridBagLayout());
 
-		GridBagConstraints c = new GridBagConstraints();
+		AltosLink link;
+		try {
+			link = new AltosSerial(device);
+		} catch (Exception ex) {
+			idle_exception(in_owner, ex);
+			return;
+		}
 
-		java.net.URL imgURL = AltosUI.class.getResource("/altus-metrum-16x16.jpg");
-		if (imgURL != null)
-			setIconImage(new ImageIcon(imgURL).getImage());
+		bag = getContentPane();
+		bag.setLayout(new GridBagLayout());
 
 		setTitle(String.format("AltOS %s", device.toShortString()));
 
 		/* Stick frequency selector at top of table for telemetry monitoring */
 		if (remote && serial >= 0) {
 			// Frequency menu
-			frequencies = new AltosFreqList(AltosPreferences.frequency(serial));
+			frequencies = new AltosFreqList(AltosUIPreferences.frequency(serial));
 			frequencies.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
 						double frequency = frequencies.frequency();
 						thread.set_frequency(frequency);
-						AltosPreferences.set_frequency(device.getSerial(),
+						AltosUIPreferences.set_frequency(device.getSerial(),
 									       frequency);
 					}
 			});
-			c.gridx = 0;
-			c.gridy = 0;
-			c.insets = new Insets(3, 3, 3, 3);
-			c.anchor = GridBagConstraints.WEST;
-			bag.add (frequencies, c);
+			bag.add (frequencies, constraints(0, 1));
+			bag.add (new JLabel("Callsign:"), constraints(1, 1));
+			/* Add callsign configuration */
+			callsign_value = new JTextField(AltosUIPreferences.callsign());
+			callsign_value.getDocument().addDocumentListener(this);
+			callsign_value.setToolTipText("Callsign sent in packet mode");
+			bag.add(callsign_value, constraints(2, 1, GridBagConstraints.BOTH));
+			row++;
 		}
 
 
 		/* Flight status is always visible */
 		flightStatus = new AltosFlightStatus();
-		c.gridx = 0;
-		c.gridy = 1;
-		c.fill = GridBagConstraints.HORIZONTAL;
-		c.weightx = 1;
-		c.gridwidth = 2;
-		bag.add(flightStatus, c);
-		c.gridwidth = 1;
+		bag.add(flightStatus, constraints(0, 3, GridBagConstraints.HORIZONTAL));
+		row++;
 
 		/* The rest of the window uses a tabbed pane to
 		 * show one of the alternate data views
@@ -368,28 +222,36 @@ public class AltosIdleMonitorUI extends JFrame implements AltosFlightDisplay {
 		pane.add("Table", new JScrollPane(flightInfo));
 
 		/* Make the tabbed pane use the rest of the window space */
-		c.gridx = 0;
-		c.gridy = 2;
-		c.fill = GridBagConstraints.BOTH;
-		c.weightx = 1;
-		c.weighty = 1;
-		c.gridwidth = 2;
-		bag.add(pane, c);
+		bag.add(pane, constraints(0, 3, GridBagConstraints.BOTH));
 
 		setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
+
+		AltosUIPreferences.register_font_listener(this);
+
 		addWindowListener(new WindowAdapter() {
 				@Override
 				public void windowClosing(WindowEvent e) {
-					disconnect();
+					try {
+						disconnect();
+					} catch (Exception ex) {
+						System.out.printf("Exception %s\n", ex.toString());
+						for (StackTraceElement e : ex.getStackTrace())
+							System.out.printf("%s\n", e.toString());
+					}
 					setVisible(false);
 					dispose();
+					AltosUIPreferences.unregister_font_listener(AltosIdleMonitorUI.this);
 				}
 			});
 
 		pack();
 		setVisible(true);
 
-		thread = new AltosIdleMonitor(this, device, remote);
+		thread = new AltosIdleMonitor((AltosIdleMonitorListener) this, link, (boolean) remote);
+
+		status_update = new AltosFlightStatusUpdate(flightStatus);
+
+		new javax.swing.Timer(100, status_update).start();
 
 		thread.start();
 	}