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

diff --git a/altosuilib/AltosUISeries.java b/altosuilib/AltosUISeries.java
index fe2c982b..441eba2b 100644
--- 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_1.*;
+import org.altusmetrum.altoslib_2.*;
 
 import org.jfree.ui.*;
 import org.jfree.chart.*;
@@ -34,53 +34,77 @@ import org.jfree.chart.labels.*;
 import org.jfree.data.xy.*;
 import org.jfree.data.*;
 
-public class AltosUISeries extends XYSeries {
-	NumberAxis	axis;
+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"; }
+
+	public int show_fraction(int width, boolean imperial_units) {
+		if (width < 5)
+			return 0;
+		return width - 5;
+	}
+
+	public int say_fraction(boolean imperial_units) { return 0; }
+}
+
+public class AltosUISeries extends XYSeries implements AltosUIGrapher {
+	AltosUIAxis	axis;
 	String		label;
 	AltosUnits	units;
 	Color		color;
 	XYItemRenderer	renderer;
 	int		fetch;
+	boolean		enable;
 	
-	void set_units() {
-		String	units_string = units.show_units();
-		axis.setLabel(String.format("%s (%s)", label, units_string));
-
+	public void set_units() {
+		axis.set_units();
 		StandardXYToolTipGenerator	ttg;
 
-		String  example = units.graph_format(4);
+		String	time_example = (new AltosUITime()).graph_format(7);
+		String  example = units.graph_format(7);
 
-		ttg = new StandardXYToolTipGenerator(String.format("{1}s: {2}%s ({0})", units_string),
-						     new java.text.DecimalFormat(example),
+		ttg = new StandardXYToolTipGenerator(String.format("{1}s: {2}%s ({0})",
+								   units.show_units()),
+						     new java.text.DecimalFormat(time_example),
 						     new java.text.DecimalFormat(example));
 		renderer.setBaseToolTipGenerator(ttg);
 	}
 
-	void set_enable(boolean enable) {
-		renderer.setSeriesVisible(0, enable);
-		axis.setVisible(enable);
+	public void set_enable(boolean enable) {
+		if (this.enable != enable) {
+			this.enable = enable;
+			renderer.setSeriesVisible(0, enable);
+			axis.set_enable(enable);
+		}
 	}
 
 	public void add(AltosUIDataPoint dataPoint) {
-		super.add(dataPoint.x(), dataPoint.y(fetch));
+		try {
+			super.add(dataPoint.x(), units.value(dataPoint.y(fetch)));
+		} catch (AltosUIDataMissing dm) {
+		}
 	}
 
-	public void set_axis(NumberAxis axis) {
-		this.axis = axis;
-	}
-
-	public AltosUISeries (String label, int fetch, AltosUnits units, Color color) {
+	public AltosUISeries (String label, int fetch, AltosUnits units, Color color,
+			      boolean enable, AltosUIAxis axis) {
 		super(label);
 		this.label = label;
 		this.fetch = fetch;
 		this.units = units;
 		this.color = color;
+		this.enable = enable;
+		this.axis = axis;
 
-		axis = new NumberAxis();
-		axis.setLabelPaint(color);
-		axis.setTickLabelPaint(color);
+		axis.ref(this.enable);
 
 		renderer = new XYLineAndShapeRenderer(true, false);
 		renderer.setSeriesPaint(0, color);
+		renderer.setSeriesVisible(0, enable);
+		set_units();
 	}
 }