projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Show GPS max height in flight stats window of graph
[fw/altos]
/
altoslib
/
AltosDistance.java
diff --git
a/altoslib/AltosDistance.java
b/altoslib/AltosDistance.java
index 25028ac79a2ae255717c901ef41f0460dbdca71c..71ee81d7c9ee895d1fadc7b824feb38b29f8d093 100644
(file)
--- a/
altoslib/AltosDistance.java
+++ b/
altoslib/AltosDistance.java
@@
-15,36
+15,42
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_
1
;
+package org.altusmetrum.altoslib_
3
;
public class AltosDistance extends AltosUnits {
public class AltosDistance extends AltosUnits {
- public double value(double v) {
- if (
AltosConvert.
imperial_units)
+ public double value(double v
, boolean imperial_units
) {
+ if (imperial_units)
return AltosConvert.meters_to_miles(v);
return v;
}
return AltosConvert.meters_to_miles(v);
return v;
}
- public String show_units() {
- if (AltosConvert.imperial_units)
+ public double inverse(double v, boolean imperial_units) {
+ if (imperial_units)
+ return AltosConvert.miles_to_meters(v);
+ return v;
+ }
+
+ public String show_units(boolean imperial_units) {
+ if (imperial_units)
return "miles";
return "m";
}
return "miles";
return "m";
}
- public String say_units() {
- if (
AltosConvert.
imperial_units)
+ public String say_units(
boolean imperial_units
) {
+ if (imperial_units)
return "miles";
return "meters";
}
return "miles";
return "meters";
}
- public int show_fraction(int width) {
- if (
AltosConvert.
imperial_units)
+ public int show_fraction(int width
, boolean imperial_units
) {
+ if (imperial_units)
return width / 3;
return width / 9;
}
return width / 3;
return width / 9;
}
- public int say_fraction() {
- if (
AltosConvert.
imperial_units)
+ public int say_fraction(
boolean imperial_units
) {
+ if (imperial_units)
return 1;
return 0;
}
return 1;
return 0;
}