projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Add quadrature driver
[fw/altos]
/
altosui
/
AltosUI.java
diff --git
a/altosui/AltosUI.java
b/altosui/AltosUI.java
index 7d4b2edbf4708892fd3e46d83665de6525745a1b..926d66f083a076c8634cbe4dc6e5a8db05542b46 100644
(file)
--- a/
altosui/AltosUI.java
+++ b/
altosui/AltosUI.java
@@
-27,6
+27,7
@@
import java.util.*;
import java.text.*;
import java.util.prefs.*;
import java.util.concurrent.*;
import java.text.*;
import java.util.prefs.*;
import java.util.concurrent.*;
+import org.altusmetrum.AltosLib.*;
import libaltosJNI.*;
import libaltosJNI.*;
@@
-47,7
+48,7
@@
public class AltosUI extends AltosFrame {
void telemetry_window(AltosDevice device) {
try {
void telemetry_window(AltosDevice device) {
try {
- AltosFlightReader reader = new AltosTelemetryReader(
device
);
+ AltosFlightReader reader = new AltosTelemetryReader(
new AltosSerial(device)
);
if (reader != null)
new AltosFlightUI(voice, reader, device.getSerial());
} catch (FileNotFoundException ee) {
if (reader != null)
new AltosFlightUI(voice, reader, device.getSerial());
} catch (FileNotFoundException ee) {
@@
-108,7
+109,7
@@
public class AltosUI extends AltosFrame {
if (imgURL != null)
setIconImage(new ImageIcon(imgURL).getImage());
if (imgURL != null)
setIconImage(new ImageIcon(imgURL).getImage());
- AltosPreferences.set_component(this);
+ Altos
UI
Preferences.set_component(this);
pane = getContentPane();
gridbag = new GridBagLayout();
pane = getContentPane();
gridbag = new GridBagLayout();
@@
-262,9
+263,9
@@
public class AltosUI extends AltosFrame {
String result;
result = JOptionPane.showInputDialog(AltosUI.this,
"Configure Callsign",
String result;
result = JOptionPane.showInputDialog(AltosUI.this,
"Configure Callsign",
- AltosPreferences.callsign());
+ Altos
UI
Preferences.callsign());
if (result != null)
if (result != null)
- AltosPreferences.set_callsign(result);
+ Altos
UI
Preferences.set_callsign(result);
}
void ConfigureTeleMetrum() {
}
void ConfigureTeleMetrum() {
@@
-537,8
+538,9
@@
public class AltosUI extends AltosFrame {
}
public static void main(final String[] args) {
}
public static void main(final String[] args) {
+ load_library(null);
try {
try {
- UIManager.setLookAndFeel(AltosPreferences.look_and_feel());
+ UIManager.setLookAndFeel(Altos
UI
Preferences.look_and_feel());
} catch (Exception e) {
}
/* Handle batch-mode */
} catch (Exception e) {
}
/* Handle batch-mode */