diff options
| author | Keith Packard <keithp@keithp.com> | 2016-05-10 22:46:58 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2016-05-11 23:22:15 -0700 |
| commit | 60f4d69592c440ab7bb67a04f4c07fc7279d2c20 (patch) | |
| tree | 8edfca4a59b5d15d251607075453aeab1a9f376f /altosuilib | |
| parent | 6a6da23335e6e5864387c7a22946f80f51056a4f (diff) | |
altoslib: Switch distance from m/ft to km/miles for large values
This adds lots of infrastructure to deal with making the unit used
depend on the value itself, and then uses it only for distances.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altosuilib')
| -rw-r--r-- | altosuilib/AltosUIAxis.java | 2 | ||||
| -rw-r--r-- | altosuilib/AltosUIMapPreloadNew.java | 2 | ||||
| -rw-r--r-- | altosuilib/AltosUISeries.java | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/altosuilib/AltosUIAxis.java b/altosuilib/AltosUIAxis.java index e307874a..24ea23d3 100644 --- a/altosuilib/AltosUIAxis.java +++ b/altosuilib/AltosUIAxis.java @@ -48,7 +48,7 @@ public class AltosUIAxis extends NumberAxis { public final static int axis_default = axis_include_zero; public void set_units() { - String u = units.show_units(); + String u = units.parse_units(); if (u != null) setLabel(String.format("%s (%s)", label, u)); else diff --git a/altosuilib/AltosUIMapPreloadNew.java b/altosuilib/AltosUIMapPreloadNew.java index 3269bbdd..cce07ab4 100644 --- a/altosuilib/AltosUIMapPreloadNew.java +++ b/altosuilib/AltosUIMapPreloadNew.java @@ -231,7 +231,7 @@ public class AltosUIMapPreloadNew extends AltosUIFrame implements ActionListener Double r = (Double) radius.getSelectedItem(); if (AltosPreferences.imperial_units()) - r = AltosConvert.distance.inverse(r); + r = AltosConvert.miles_to_meters(r); else r = r * 1000; loading = true; diff --git a/altosuilib/AltosUISeries.java b/altosuilib/AltosUISeries.java index b16f046b..c9401be0 100644 --- a/altosuilib/AltosUISeries.java +++ b/altosuilib/AltosUISeries.java @@ -69,7 +69,7 @@ public class AltosUISeries extends XYSeries implements AltosUIGrapher { String example = units.graph_format(7); ttg = new StandardXYToolTipGenerator(String.format("{1}s: {2}%s ({0})", - units.show_units()), + units.graph_units()), new java.text.DecimalFormat(time_example), new java.text.DecimalFormat(example)); renderer.setBaseToolTipGenerator(ttg); @@ -85,7 +85,7 @@ public class AltosUISeries extends XYSeries implements AltosUIGrapher { public void add(AltosUIDataPoint dataPoint) { try { - super.add(dataPoint.x(), units.value(dataPoint.y(fetch))); + super.add(dataPoint.x(), units.graph_value(dataPoint.y(fetch))); } catch (AltosUIDataMissing dm) { } } |