projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosdroid: Place icons on screen instead of drawing path
[fw/altos]
/
altoslib
/
AltosTemperature.java
diff --git
a/altoslib/AltosTemperature.java
b/altoslib/AltosTemperature.java
index 2749eac09dfdbd08ffc538be1097e1247b821fec..d729b5760ad71e518c43c52f56feec1b8e32bacc 100644
(file)
--- a/
altoslib/AltosTemperature.java
+++ b/
altoslib/AltosTemperature.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_
7
;
public class AltosTemperature extends AltosUnits {
public class AltosTemperature extends AltosUnits {
- public double value(double v) {
- if (
AltosConvert.
imperial_units)
+ public double value(double v
, boolean imperial_units
) {
+ if (imperial_units)
return AltosConvert.c_to_f(v);
return v;
}
return AltosConvert.c_to_f(v);
return v;
}
- public String show_units() {
- if (AltosConvert.imperial_units)
+ public double inverse(double v, boolean imperial_units) {
+ if (imperial_units)
+ return AltosConvert.f_to_c(v);
+ return v;
+ }
+
+ public String show_units(boolean imperial_units) {
+ if (imperial_units)
return "°F";
return "°C";
}
return "°F";
return "°C";
}
- public String say_units() {
- if (
AltosConvert.
imperial_units)
+ public String say_units(
boolean imperial_units
) {
+ if (imperial_units)
return "degrees farenheit";
return "degrees celsius";
}
return "degrees farenheit";
return "degrees celsius";
}
- public int show_fraction(int width) {
+ public int show_fraction(int width
, boolean imperial_units
) {
return width / 3;
}
}
return width / 3;
}
}