X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosIdleMonitorUI.java;h=2f14e2dffa38db5b9bb37c5d5021fa0da9c43133;hb=master;hp=d789de77191319de63c00b7a0ac3a346ff516dfc;hpb=0b0b359cbce6b818257b44b2a6aee0edcbaee40d;p=fw%2Faltos

diff --git a/altosui/AltosIdleMonitorUI.java b/altosui/AltosIdleMonitorUI.java
index d789de77..ba894c71 100644
--- a/altosui/AltosIdleMonitorUI.java
+++ b/altosui/AltosIdleMonitorUI.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -24,8 +25,8 @@ import javax.swing.event.*;
 import java.io.*;
 import java.util.concurrent.*;
 import java.util.Arrays;
-import org.altusmetrum.altoslib_10.*;
-import org.altusmetrum.altosuilib_10.*;
+import org.altusmetrum.altoslib_14.*;
+import org.altusmetrum.altosuilib_14.*;
 
 public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDisplay, AltosIdleMonitorListener, DocumentListener {
 	AltosDevice		device;
@@ -33,12 +34,12 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
 	AltosPad		pad;
 	AltosInfoTable		flightInfo;
 	AltosFlightStatus	flightStatus;
-	AltosIgnitor		ignitor;
+	AltosIgnitor		igniter;
 	AltosIdleMonitor	thread;
-	AltosUIMapNew      	sitemap;
+	AltosUIMap      	sitemap;
 	int			serial;
 	boolean			remote;
-	boolean			has_ignitor;
+	boolean			has_igniter;
 	boolean			has_map;
 
 	void stop_display() {
@@ -74,15 +75,15 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
 
 	public void show(AltosState state, AltosListenerState listener_state) {
 		status_update.saved_state = state;
-		if (ignitor.should_show(state)) {
-			if (!has_ignitor) {
-				pane.add("Ignitor", ignitor);
-				has_ignitor = true;
+		if (igniter.should_show(state)) {
+			if (!has_igniter) {
+				pane.add("Ignitor", igniter);
+				has_igniter = true;
 			}
 		} else {
-			if (has_ignitor) {
-				pane.remove(ignitor);
-				has_ignitor = false;
+			if (has_igniter) {
+				pane.remove(igniter);
+				has_igniter = false;
 			}
 		}
 		if (state.gps != null && state.gps.connected) {
@@ -101,8 +102,8 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
 			pad.show(state, listener_state);
 			flightStatus.show(state, listener_state);
 			flightInfo.show(state, listener_state);
-			if (has_ignitor)
-				ignitor.show(state, listener_state);
+			if (has_igniter)
+				igniter.show(state, listener_state);
 			if (has_map)
 				sitemap.show(state, listener_state);
 //		} catch (Exception e) {
@@ -208,7 +209,7 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
 
 		device = AltosDeviceUIDialog.show(in_owner, Altos.product_any);
 		remote = false;
-		if (!device.matchProduct(Altos.product_altimeter))
+		if (device.matchProduct(Altos.product_basestation))
 			remote = true;
 
 		serial = device.getSerial();
@@ -225,7 +226,7 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
 		/* We let the user set the freq/callsign, so don't bother with the cancel dialog */
 		link.set_cancel_enable(false);
 
-		bag = getContentPane();
+		bag = getScrollablePane();
 		bag.setLayout(new GridBagLayout());
 
 		setTitle(String.format("AltOS %s", device.toShortString()));
@@ -273,9 +274,9 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
 		flightInfo = new AltosInfoTable();
 		pane.add("Table", new JScrollPane(flightInfo));
 
-		ignitor = new AltosIgnitor();
+		igniter = new AltosIgnitor();
 
-		sitemap = new AltosUIMapNew();
+		sitemap = new AltosUIMap();
 
 		/* Make the tabbed pane use the rest of the window space */
 		bag.add(pane, constraints(0, 4, GridBagConstraints.BOTH));
@@ -294,7 +295,9 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
 		pack();
 		setVisible(true);
 
-		thread = new AltosIdleMonitor((AltosIdleMonitorListener) this, link, (boolean) remote);
+		thread = new AltosIdleMonitor(this, link, (boolean) remote);
+
+		thread.set_frequency(AltosUIPreferences.frequency(serial));
 
 		status_update = new AltosFlightStatusUpdate(flightStatus);