projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos]
/
altoslib
/
AltosHeight.java
diff --git
a/altoslib/AltosHeight.java
b/altoslib/AltosHeight.java
index ed590812c5245b7076955b7e583d0337ffc47d4a..f65ca89931e1bdd2be489e0219d5cee1c7a791ba 100644
(file)
--- a/
altoslib/AltosHeight.java
+++ b/
altoslib/AltosHeight.java
@@
-3,7
+3,8
@@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-15,29
+16,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_1
3
;
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";
}
- public 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