projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Not all products have pins to control flash loader
[fw/altos]
/
altoslib
/
AltosHeight.java
diff --git
a/altoslib/AltosHeight.java
b/altoslib/AltosHeight.java
index d7192e0b6512d5dccf8c9e9150d70a8a810f19a7..96f5722bde80bcca8b3a33d32b3d32b345d2acd4 100644
(file)
--- a/
altoslib/AltosHeight.java
+++ b/
altoslib/AltosHeight.java
@@
-15,7
+15,7
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib;
+package org.altusmetrum.altoslib
_1
;
public class AltosHeight extends AltosUnits {
public class AltosHeight extends AltosUnits {
@@
-25,6
+25,13
@@
public class AltosHeight extends AltosUnits {
return v;
}
return v;
}
+ public double parse(String s) throws NumberFormatException {
+ double v = Double.parseDouble(s);
+ if (AltosConvert.imperial_units)
+ v = AltosConvert.feet_to_meters(v);
+ return v;
+ }
+
public String show_units() {
if (AltosConvert.imperial_units)
return "ft";
public String show_units() {
if (AltosConvert.imperial_units)
return "ft";
@@
-37,7
+44,7
@@
public class AltosHeight extends AltosUnits {
return "meters";
}
return "meters";
}
- int show_fraction(int width) {
+
public
int show_fraction(int width) {
return width / 9;
}
}
\ No newline at end of file
return width / 9;
}
}
\ No newline at end of file