diff options
Diffstat (limited to 'altoslib/AltosTemperature.java')
| -rw-r--r-- | altoslib/AltosTemperature.java | 20 | 
1 files changed, 13 insertions, 7 deletions
| diff --git a/altoslib/AltosTemperature.java b/altoslib/AltosTemperature.java index 0105fe53..a636533f 100644 --- a/altoslib/AltosTemperature.java +++ b/altoslib/AltosTemperature.java @@ -19,25 +19,31 @@ package org.altusmetrum.altoslib_2;  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;  	} -	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";  	} -	public String say_units() { -		if (AltosConvert.imperial_units) +	public String say_units(boolean imperial_units) { +		if (imperial_units)  			return "degrees farenheit";  		return "degrees celsius";  	} -	public int show_fraction(int width) { +	public int show_fraction(int width, boolean imperial_units) {  		return width / 3;  	}  } | 
