X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosuilib%2FAltosUISeries.java;h=66cc7d69a6133ffe3540f576d15f690bb8959e55;hb=6ed63dfbf0a0205df17afb2ea54afad441a69604;hp=441eba2b33587c47790f4e21870629f06e7b6b05;hpb=eee9b3ce1e5adae5aa4566050b6d6048344e92c4;p=fw%2Faltos

diff --git a/altosuilib/AltosUISeries.java b/altosuilib/AltosUISeries.java
index 441eba2b..66cc7d69 100644
--- a/altosuilib/AltosUISeries.java
+++ b/altosuilib/AltosUISeries.java
@@ -3,7 +3,8 @@
  *
  * 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.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,14 +16,14 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_1;
+package org.altusmetrum.altosuilib_11;
 
 import java.io.*;
 import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_2.*;
+import org.altusmetrum.altoslib_11.*;
 
 import org.jfree.ui.*;
 import org.jfree.chart.*;
@@ -38,7 +39,7 @@ class AltosUITime extends AltosUnits {
 	public double value(double v, boolean imperial_units) { return v; }
 
 	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"; }
@@ -60,7 +61,7 @@ public class AltosUISeries extends XYSeries implements AltosUIGrapher {
 	XYItemRenderer	renderer;
 	int		fetch;
 	boolean		enable;
-	
+
 	public void set_units() {
 		axis.set_units();
 		StandardXYToolTipGenerator	ttg;
@@ -69,7 +70,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 +86,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) {
 		}
 	}
@@ -104,6 +105,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();
 	}