altosuilib: Make lines in graphs 2 units wide

[fw/altos] / altosuilib / AltosUISeries.java

diff --git a/altosuilib/AltosUISeries.java b/altosuilib/AltosUISeries.java
index ff430d1a1384820983d3c2cade3fe9364af71a57..10ea161458b5e260d48667f664f3ba9a49c46d61 100644 (file)
--- a/altosuilib/AltosUISeries.java
+++ b/altosuilib/AltosUISeries.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_2.*;
+import org.altusmetrum.altoslib_3.*;
 
 import org.jfree.ui.*;
 import org.jfree.chart.*;
@@ -35,17 +35,21 @@ import org.jfree.data.xy.*;
 import org.jfree.data.*;
 
 class AltosUITime extends AltosUnits {
-       public double value(double v) { return v; }
-       public String show_units() { return "s"; }
-       public String say_units() { return "seconds"; }
+       public double value(double v, boolean imperial_units) { return v; }
 
-       public int show_fraction(int width) {
+       public double inverse(double v, boolean imperial_unis) { return v; }
+
+       public String show_units(boolean imperial_units) { return "s"; }
+
+       public String say_units(boolean imperial_units) { return "seconds"; }
+
+       public int show_fraction(int width, boolean imperial_units) {
                if (width < 5)
                        return 0;
                return width - 5;
        }
 
-       public int say_fraction() { return 0; }
+       public int say_fraction(boolean imperial_units) { return 0; }
 }
 
 public class AltosUISeries extends XYSeries implements AltosUIGrapher {
@@ -56,7 +60,7 @@ public class AltosUISeries extends XYSeries implements AltosUIGrapher {
        XYItemRenderer  renderer;
        int             fetch;
        boolean         enable;
-       
+
        public void set_units() {
                axis.set_units();
                StandardXYToolTipGenerator      ttg;
@@ -100,6 +104,7 @@ public class AltosUISeries extends XYSeries implements AltosUIGrapher {
 
                renderer = new XYLineAndShapeRenderer(true, false);
                renderer.setSeriesPaint(0, color);
+               renderer.setSeriesStroke(0, new BasicStroke(2, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
                renderer.setSeriesVisible(0, enable);
                set_units();
        }