Merge branch 'branch-1.2' into debian

1 files changed, 43 insertions, 0 deletions

diff --git a/altoslib/AltosTemperature.java b/altoslib/AltosTemperature.java
new file mode 100644
index 00000000..2749eac0
--- /dev/null
+++ b/altoslib/AltosTemperature.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2012 Keith Packard <keithp@keithp.com>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+package org.altusmetrum.altoslib_1;
+
+public class AltosTemperature extends AltosUnits {
+
+	public double value(double v) {
+		if (AltosConvert.imperial_units)
+			return AltosConvert.c_to_f(v);
+		return v;
+	}
+
+	public String show_units() {
+		if (AltosConvert.imperial_units)
+			return "°F";
+		return "°C";
+	}
+
+	public String say_units() {
+		if (AltosConvert.imperial_units)
+			return "degrees farenheit";
+		return "degrees celsius";
+	}
+
+	public int show_fraction(int width) {
+		return width / 3;
+	}
+}