X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosuilib%2FAltosUIFlightSeries.java;h=eade12af1d652b52b6611ba3a32409aeb4cc8067;hb=9454756f54312381927cb9faf1c4a6f5d8271034;hp=d15c40718ca1187b57ff86d177cb6e147947aeaa;hpb=96de483d745ea0ef95326de2847a2534f7057846;p=fw%2Faltos

diff --git a/altosuilib/AltosUIFlightSeries.java b/altosuilib/AltosUIFlightSeries.java
index d15c4071..eade12af 100644
--- a/altosuilib/AltosUIFlightSeries.java
+++ b/altosuilib/AltosUIFlightSeries.java
@@ -19,50 +19,106 @@ import java.awt.*;
 import javax.swing.*;
 import org.altusmetrum.altoslib_11.*;
 
-class AltosUITimeSeriesExtra {
+import org.jfree.ui.*;
+import org.jfree.chart.*;
+import org.jfree.chart.plot.*;
+import org.jfree.chart.axis.*;
+import org.jfree.chart.renderer.*;
+import org.jfree.chart.renderer.xy.*;
+import org.jfree.chart.labels.*;
+import org.jfree.data.xy.*;
+import org.jfree.data.*;
+
+class AltosUITimeSeriesAxis {
 	Color		color;
 	boolean		enabled;
+	boolean		marker;
+	boolean		marker_top;
 	AltosUIAxis	axis;
+	XYPlot		plot;
 
-	public AltosUITimeSeriesExtra(Color color, boolean enabled, AltosUIAxis axis) {
+	public AltosUITimeSeriesAxis(Color color, boolean enabled, AltosUIAxis axis, XYPlot plot, boolean marker, boolean marker_top) {
 		this.color = color;
 		this.enabled = enabled;
 		this.axis = axis;
+		this.plot = plot;
+		this.marker = marker;
+		this.marker_top = marker_top;
 	}
 }
 
 public class AltosUIFlightSeries extends AltosFlightSeries {
 
-	Hashtable<String,AltosUITimeSeriesExtra> extra;
+	Hashtable<String,AltosUITimeSeriesAxis> axes;
+
+	AltosUIFlightSeries flight_series;
+
+	void fill_axes(String label, AltosUITimeSeriesAxis axis) {
+		for (AltosTimeSeries ts : series) {
+			AltosUITimeSeries uts = (AltosUITimeSeries) ts;
+
+			if (label.equals(ts.label) || (label.equals("default") && uts.color == null)) {
+				if (axis.marker)
+					uts.set_marker(axis.color, axis.enabled, axis.plot, axis.marker_top);
+				else
+					uts.set_axis(axis.color, axis.enabled, axis.axis);
+			}
+		}
+	}
 
-	public void register_extra(String label,
-				   Color color,
-				   boolean enabled,
-				   AltosUIAxis axis) {
+	public void register_axis(String label,
+				  Color color,
+				  boolean enabled,
+				  AltosUIAxis axis) {
+		AltosUITimeSeriesAxis tsa = new AltosUITimeSeriesAxis(color,
+								      enabled,
+								      axis,
+								      null,
+								      false,
+								      false);
+		axes.put(label, tsa);
+		fill_axes(label, tsa);
+	}
 
-		AltosUITimeSeriesExtra e = new AltosUITimeSeriesExtra(color,
+	public void register_marker(String label,
+				    Color color,
+				    boolean enabled,
+				    XYPlot plot,
+				    boolean marker_top) {
+		AltosUITimeSeriesAxis tsa = new AltosUITimeSeriesAxis(color,
 								      enabled,
-								      axis);
-		System.out.printf("register extra label %s extra %s\n", label, e);
-		extra.put(label, e);
+								      null,
+								      plot,
+								      true,
+								      marker_top);
+		axes.put(label, tsa);
+		fill_axes(label, tsa);
 	}
 
 	public AltosTimeSeries make_series(String label, AltosUnits units) {
 
-		AltosUITimeSeriesExtra e = extra.get(label);
 
-		if (e == null)
-			e = extra.get("default");
-		return new AltosUITimeSeries(label, units,
-					     e.color, e.enabled, e.axis);
+		AltosUITimeSeries time_series = new AltosUITimeSeries(label, units);
+
+		AltosUITimeSeriesAxis tsa = axes.get(label);
+		if (tsa == null)
+			tsa = axes.get("default");
+		if (tsa != null) {
+			if (tsa.marker)
+				time_series.set_marker(tsa.color, tsa.enabled, tsa.plot, tsa.marker_top);
+			else
+				time_series.set_axis(tsa.color, tsa.enabled, tsa.axis);
+		}
+		return time_series;
 	}
 
-	public AltosUITimeSeries[] series() {
+	public AltosUITimeSeries[] series(AltosCalData cal_data) {
+		finish();
 		return series.toArray(new AltosUITimeSeries[0]);
 	}
 
-	public AltosUIFlightSeries () {
-		super();
-		extra = new Hashtable<String,AltosUITimeSeriesExtra>();
+	public AltosUIFlightSeries (AltosCalData cal_data) {
+		super(cal_data);
+		axes = new Hashtable<String,AltosUITimeSeriesAxis>();
 	}
 }