projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean up reflashing section, include section on self-flash recovery
[fw/altos]
/
altoslib
/
AltosHeight.java
diff --git
a/altoslib/AltosHeight.java
b/altoslib/AltosHeight.java
index e0fef5f6023f37b1933be1754e872eebbdbe6a55..84bd42d91589e1324bf1cb5dc825e5f9ca488269 100644
(file)
--- a/
altoslib/AltosHeight.java
+++ b/
altoslib/AltosHeight.java
@@
-15,29
+15,35
@@
* 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_
2
;
public class AltosHeight extends AltosUnits {
public class AltosHeight 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_feet(v);
return v;
}
return AltosConvert.meters_to_feet(v);
return v;
}
- public String show_units() {
- if (AltosConvert.imperial_units)
+ public double inverse(double v, boolean imperial_units) {
+ if (imperial_units)
+ return AltosConvert.feet_to_meters(v);
+ return v;
+ }
+
+ public String show_units(boolean imperial_units) {
+ if (imperial_units)
return "ft";
return "m";
}
return "ft";
return "m";
}
- public String say_units() {
- if (
AltosConvert.
imperial_units)
+ public String say_units(
boolean imperial_units
) {
+ if (imperial_units)
return "feet";
return "meters";
}
return "feet";
return "meters";
}
-
int show_fraction(int width
) {
+
public int show_fraction(int width, boolean imperial_units
) {
return width / 9;
}
}
\ No newline at end of file
return width / 9;
}
}
\ No newline at end of file