X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosuilib%2FAltosUIFlightSeries.java;h=eade12af1d652b52b6611ba3a32409aeb4cc8067;hp=1840761e11b80d5993b96b5573901e111c071dde;hb=fd738d47bbc46d36698350d5450abe1125d990a3;hpb=e6eb659b0e984515a33b3ddabfe8325742a952da

diff --git a/altosuilib/AltosUIFlightSeries.java b/altosuilib/AltosUIFlightSeries.java
index 1840761e..eade12af 100644
--- a/altosuilib/AltosUIFlightSeries.java
+++ b/altosuilib/AltosUIFlightSeries.java
@@ -33,15 +33,17 @@ class AltosUITimeSeriesAxis {
 	Color		color;
 	boolean		enabled;
 	boolean		marker;
+	boolean		marker_top;
 	AltosUIAxis	axis;
 	XYPlot		plot;
 
-	public AltosUITimeSeriesAxis(Color color, boolean enabled, AltosUIAxis axis, XYPlot plot, boolean marker) {
+	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;
 	}
 }
 
@@ -57,7 +59,7 @@ public class AltosUIFlightSeries extends AltosFlightSeries {
 
 			if (label.equals(ts.label) || (label.equals("default") && uts.color == null)) {
 				if (axis.marker)
-					uts.set_marker(axis.color, axis.enabled, axis.plot);
+					uts.set_marker(axis.color, axis.enabled, axis.plot, axis.marker_top);
 				else
 					uts.set_axis(axis.color, axis.enabled, axis.axis);
 			}
@@ -72,6 +74,7 @@ public class AltosUIFlightSeries extends AltosFlightSeries {
 								      enabled,
 								      axis,
 								      null,
+								      false,
 								      false);
 		axes.put(label, tsa);
 		fill_axes(label, tsa);
@@ -80,12 +83,14 @@ public class AltosUIFlightSeries extends AltosFlightSeries {
 	public void register_marker(String label,
 				    Color color,
 				    boolean enabled,
-				    XYPlot plot) {
+				    XYPlot plot,
+				    boolean marker_top) {
 		AltosUITimeSeriesAxis tsa = new AltosUITimeSeriesAxis(color,
 								      enabled,
 								      null,
 								      plot,
-								      true);
+								      true,
+								      marker_top);
 		axes.put(label, tsa);
 		fill_axes(label, tsa);
 	}
@@ -100,7 +105,7 @@ public class AltosUIFlightSeries extends AltosFlightSeries {
 			tsa = axes.get("default");
 		if (tsa != null) {
 			if (tsa.marker)
-				time_series.set_marker(tsa.color, tsa.enabled, tsa.plot);
+				time_series.set_marker(tsa.color, tsa.enabled, tsa.plot, tsa.marker_top);
 			else
 				time_series.set_axis(tsa.color, tsa.enabled, tsa.axis);
 		}
@@ -108,7 +113,7 @@ public class AltosUIFlightSeries extends AltosFlightSeries {
 	}
 
 	public AltosUITimeSeries[] series(AltosCalData cal_data) {
-		fill_in();
+		finish();
 		return series.toArray(new AltosUITimeSeries[0]);
 	}