projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
now building for m4, too
[fw/altos]
/
telegps
/
TeleGPSConfigUI.java
diff --git
a/telegps/TeleGPSConfigUI.java
b/telegps/TeleGPSConfigUI.java
index 0189a8092e998eca49eb63f5158f0ba0bedc2088..5a3a05eb395fc5368085b8c0f0ca28ca46797f7e 100644
(file)
--- a/
telegps/TeleGPSConfigUI.java
+++ b/
telegps/TeleGPSConfigUI.java
@@
-17,12
+17,13
@@
package org.altusmetrum.telegps;
package org.altusmetrum.telegps;
+import java.text.*;
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
import javax.swing.event.*;
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
import javax.swing.event.*;
-import org.altusmetrum.altoslib_
6
.*;
-import org.altusmetrum.altosuilib_
6
.*;
+import org.altusmetrum.altoslib_
9
.*;
+import org.altusmetrum.altosuilib_
9
.*;
public class TeleGPSConfigUI
extends AltosUIDialog
public class TeleGPSConfigUI
extends AltosUIDialog
@@
-686,7
+687,11
@@
public class TeleGPSConfigUI
String motion = tracker_motion_value.getSelectedItem().toString();
tracker_motion_label.setText(get_tracker_motion_label());
set_tracker_motion_values();
String motion = tracker_motion_value.getSelectedItem().toString();
tracker_motion_label.setText(get_tracker_motion_label());
set_tracker_motion_values();
- set_tracker_motion((int) (AltosConvert.height.parse(motion, !imperial_units) + 0.5));
+ try {
+ int m = (int) (AltosConvert.height.parse_locale(motion, !imperial_units) + 0.5);
+ set_tracker_motion(m);
+ } catch (ParseException pe) {
+ }
}
if (!was_dirty)
set_clean();
}
if (!was_dirty)
set_clean();
@@
-862,7
+867,7
@@
public class TeleGPSConfigUI
}
String get_tracker_motion_label() {
}
String get_tracker_motion_label() {
- return String.format("Logging Trigger Motion (%s):", AltosConvert.height.show_units
_name(AltosLib.MISSING
));
+ return String.format("Logging Trigger Motion (%s):", AltosConvert.height.show_units
(
));
}
void set_tracker_tool_tip() {
}
void set_tracker_tool_tip() {
@@
-886,7
+891,12
@@
public class TeleGPSConfigUI
}
public int tracker_motion() throws AltosConfigDataException {
}
public int tracker_motion() throws AltosConfigDataException {
- return (int) AltosConvert.height.parse(tracker_motion_value.getSelectedItem().toString());
+ String str = tracker_motion_value.getSelectedItem().toString();
+ try {
+ return (int) (AltosConvert.height.parse_locale(str) + 0.5);
+ } catch (ParseException pe) {
+ throw new AltosConfigDataException("invalid tracker motion %s", str);
+ }
}
public void set_tracker_interval(int tracker_interval) {
}
public void set_tracker_interval(int tracker_interval) {