projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosuilib: Make graph enable buttons be CheckBoxes instead of RadioButtons
[fw/altos]
/
altosui
/
AltosUI.java
diff --git
a/altosui/AltosUI.java
b/altosui/AltosUI.java
index 5d4599476ba44bd988e0b57a1f792fe12fd5dd6f..6137487c418cb0bf8fc414c292a00b2e77516dde 100644
(file)
--- a/
altosui/AltosUI.java
+++ b/
altosui/AltosUI.java
@@
-22,8
+22,8
@@
import java.awt.event.*;
import javax.swing.*;
import java.io.*;
import java.util.concurrent.*;
import javax.swing.*;
import java.io.*;
import java.util.concurrent.*;
-import org.altusmetrum.altoslib_
3
.*;
-import org.altusmetrum.altosuilib_
1
.*;
+import org.altusmetrum.altoslib_
4
.*;
+import org.altusmetrum.altosuilib_
2
.*;
public class AltosUI extends AltosUIFrame {
public AltosVoice voice = new AltosVoice();
public class AltosUI extends AltosUIFrame {
public AltosVoice voice = new AltosVoice();
@@
-74,6
+74,10
@@
public class AltosUI extends AltosUIFrame {
}
}
}
}
+ public void scan_device_selected(AltosDevice device) {
+ telemetry_window(device);
+ }
+
Container pane;
GridBagLayout gridbag;
Container pane;
GridBagLayout gridbag;
@@
-233,7
+237,7
@@
public class AltosUI extends AltosUIFrame {
});
setLocationByPlatform(false);
});
setLocationByPlatform(false);
-
+
/* Insets aren't set before the window is visible */
setVisible(true);
}
/* Insets aren't set before the window is visible */
setVisible(true);
}
@@
-272,11
+276,11
@@
public class AltosUI extends AltosUIFrame {
}
void ScanChannels() {
}
void ScanChannels() {
- new AltosScanUI(AltosUI.this);
+ new AltosScanUI(AltosUI.this
, true
);
}
void LoadMaps() {
}
void LoadMaps() {
- new Altos
Site
MapPreload(AltosUI.this);
+ new Altos
UI
MapPreload(AltosUI.this);
}
void LaunchController() {
}
void LaunchController() {
@@
-302,7
+306,7
@@
public class AltosUI extends AltosUIFrame {
* a TeleDongle over the packet link
*/
private void SaveFlightData() {
* a TeleDongle over the packet link
*/
private void SaveFlightData() {
- new AltosEepromManage(AltosUI.this);
+ new AltosEepromManage(AltosUI.this
, AltosLib.product_any
);
}
/* Load a flight log file and write out a CSV file containing
}
/* Load a flight log file and write out a CSV file containing
@@
-468,7
+472,7
@@
public class AltosUI extends AltosUIFrame {
}
return false;
}
}
return false;
}
-
+
static boolean process_summary(File file) {
AltosStateIterable states = record_iterable(file);
if (states == null)
static boolean process_summary(File file) {
AltosStateIterable states = record_iterable(file);
if (states == null)
@@
-547,7
+551,7
@@
public class AltosUI extends AltosUIFrame {
System.out.printf(" --kml\tgenerate KML output for use with Google Earth\n");
System.exit(code);
}
System.out.printf(" --kml\tgenerate KML output for use with Google Earth\n");
System.exit(code);
}
-
+
public static void main(final String[] args) {
int errors = 0;
load_library(null);
public static void main(final String[] args) {
int errors = 0;
load_library(null);
@@
-574,7
+578,7
@@
public class AltosUI extends AltosUIFrame {
} else {
double lat = Double.parseDouble(args[i+1]);
double lon = Double.parseDouble(args[i+2]);
} else {
double lat = Double.parseDouble(args[i+1]);
double lon = Double.parseDouble(args[i+2]);
-
AltosSiteMap.prefetchMaps(lat, lon);
+
//
AltosSiteMap.prefetchMaps(lat, lon);
i += 2;
}
} else if (args[i].equals("--replay"))
i += 2;
}
} else if (args[i].equals("--replay"))