projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: create target pdclib directories before building
[fw/altos]
/
altoslib
/
AltosTemperature.java
diff --git
a/altoslib/AltosTemperature.java
b/altoslib/AltosTemperature.java
index 0105fe539f6f992e4e5f8820cd6b748e6d2acc5d..a636533f5e7c95c5cc639906c5d50bb0cbb19ba2 100644
(file)
--- a/
altoslib/AltosTemperature.java
+++ b/
altoslib/AltosTemperature.java
@@
-19,25
+19,31
@@
package org.altusmetrum.altoslib_2;
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;
}
}