X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosScanUI.java;h=2a6e140ac34f786e5f363b6a3c73ab949847c677;hp=df5c51d4a2e3ab74d98dd9ad7b0a7bd7fe9bd1f8;hb=b9bf8e01e243508297f28b102cb2477dc1bc74df;hpb=1c344b760776cd5d8c0297d8db9bf02687381b4e

diff --git a/altosui/AltosScanUI.java b/altosui/AltosScanUI.java
index df5c51d4..2a6e140a 100644
--- a/altosui/AltosScanUI.java
+++ b/altosui/AltosScanUI.java
@@ -20,14 +20,12 @@ 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 org.altusmetrum.AltosLib.*;
 
 class AltosScanResult {
 	String		callsign;
@@ -58,29 +56,50 @@ class AltosScanResult {
 	}
 
 	public boolean equals(AltosScanResult other) {
-		return (callsign.equals(other.callsign) &&
-			serial == other.serial &&
-			flight == other.flight &&
+		return (serial == other.serial &&
 			frequency.frequency == other.frequency.frequency &&
 			telemetry == other.telemetry);
 	}
+
+	public boolean up_to_date(AltosScanResult other) {
+		if (flight == 0 && other.flight != 0) {
+			flight = other.flight;
+			return false;
+		}
+		if (callsign.equals("N0CALL") && !other.callsign.equals("N0CALL")) {
+			callsign = other.callsign;
+			return false;
+		}
+		return true;
+	}
 }
 
 class AltosScanResults extends LinkedList<AltosScanResult> implements ListModel {
 	
 	LinkedList<ListDataListener>	listeners = new LinkedList<ListDataListener>();
 
+	void changed(ListDataEvent de) {
+		for (ListDataListener l : listeners)
+			l.contentsChanged(de);
+	}
+
 	public boolean add(AltosScanResult r) {
-		for (AltosScanResult old : this)
-			if (old.equals(r))
+		int i = 0;
+		for (AltosScanResult old : this) {
+			if (old.equals(r)) {
+				if (!old.up_to_date(r))
+					changed (new ListDataEvent(this,
+								   ListDataEvent.CONTENTS_CHANGED,
+								   i, i));
 				return true;
+			}
+			i++;
+		}
 
 		super.add(r);
-		ListDataEvent	de = new ListDataEvent(this,
-						       ListDataEvent.INTERVAL_ADDED,
-						       this.size() - 2, this.size() - 1);
-		for (ListDataListener l : listeners)
-			l.contentsChanged(de);
+		changed(new ListDataEvent(this,
+					  ListDataEvent.INTERVAL_ADDED,
+					  this.size() - 2, this.size() - 1));
 		return true;
 	}
 
@@ -102,7 +121,7 @@ class AltosScanResults extends LinkedList<AltosScanResult> implements ListModel
 }
 
 public class AltosScanUI
-	extends JDialog
+	extends AltosDialog
 	implements ActionListener
 {
 	AltosUI				owner;
@@ -204,10 +223,11 @@ public class AltosScanUI
 	
 	void set_frequency() throws InterruptedException, TimeoutException {
 		reader.set_frequency(frequencies[frequency_index].frequency);
+		reader.reset();
 	}
 	
 	void next() throws InterruptedException, TimeoutException {
-		reader.serial.set_monitor(false);
+		reader.set_monitor(false);
 		Thread.sleep(100);
 		++frequency_index;
 		if (frequency_index >= frequencies.length ||
@@ -223,7 +243,7 @@ public class AltosScanUI
 		}
 		set_frequency();
 		set_label();
-		reader.serial.set_monitor(true);
+		reader.set_monitor(true);
 	}
 
 
@@ -267,7 +287,7 @@ public class AltosScanUI
 					scanning_telemetry |= (1 << Altos.ao_telemetry_standard);
 					telemetry_boxes[Altos.ao_telemetry_standard - Altos.ao_telemetry_min].setSelected(true);
 				}
-				AltosPreferences.set_scanning_telemetry(scanning_telemetry);
+				AltosUIPreferences.set_scanning_telemetry(scanning_telemetry);
 			}
 
 			if (cmd.equals("monitor")) {
@@ -311,7 +331,7 @@ public class AltosScanUI
 		if (device == null)
 			return false;
 		try {
-			reader = new AltosTelemetryReader(device);
+			reader = new AltosTelemetryReader(new AltosSerial(device));
 			set_frequency();
 			set_telemetry();
 			try {
@@ -359,7 +379,7 @@ public class AltosScanUI
 
 		owner = in_owner;
 
-		frequencies = AltosPreferences.common_frequencies();
+		frequencies = AltosUIPreferences.common_frequencies();
 		frequency_index = 0;
 		telemetry = Altos.ao_telemetry_min;
 
@@ -400,11 +420,11 @@ public class AltosScanUI
 		c.gridy = 2;
 		pane.add(telemetry_label, c);
 
-		int	scanning_telemetry = AltosPreferences.scanning_telemetry();
+		int	scanning_telemetry = AltosUIPreferences.scanning_telemetry();
 		telemetry_boxes = new JCheckBox[Altos.ao_telemetry_max - Altos.ao_telemetry_min + 1];
 		for (int k = Altos.ao_telemetry_min; k <= Altos.ao_telemetry_max; k++) {
 			int j = k - Altos.ao_telemetry_min;
-			telemetry_boxes[j] = new JCheckBox(Altos.ao_telemetry_name[k]);
+			telemetry_boxes[j] = new JCheckBox(AltosLib.telemetry_name(k));
 			c.gridy = 3 + j;
 			pane.add(telemetry_boxes[j], c);
 			telemetry_boxes[j].setActionCommand("telemetry");