Add marker size option to plot markers

elevans · elevans · commit 6a60c0ddbd3f · 2025-04-03T09:10:37.000-05:00
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 
 	<groupId>org.scijava</groupId>
 	<artifactId>scijava-plot</artifactId>
-	<version>0.2.1-SNAPSHOT</version>
+	<version>0.3.0-SNAPSHOT</version>
 
 	<name>SciJava Plot</name>
 	<description>Plots for SciJava.</description>
diff --git a/src/main/java/org/scijava/plot/PlotService.java b/src/main/java/org/scijava/plot/PlotService.java
@@ -41,7 +41,13 @@
 public interface PlotService extends SciJavaService
 {
 
-	SeriesStyle newSeriesStyle(ColorRGB color, LineStyle lineStyle, MarkerStyle markerStyle);
+	double DEFAULT_MARKER_SIZE = 3.0;
+
+	default SeriesStyle newSeriesStyle(ColorRGB color, LineStyle lineStyle, MarkerStyle markerStyle) {
+		return newSeriesStyle(color, lineStyle, markerStyle, DEFAULT_MARKER_SIZE);
+	}
+
+	SeriesStyle newSeriesStyle(ColorRGB color, LineStyle lineStyle, MarkerStyle markerStyle, double markerSize);
 
 	XYPlot newXYPlot();
 
diff --git a/src/main/java/org/scijava/plot/SeriesStyle.java b/src/main/java/org/scijava/plot/SeriesStyle.java
@@ -45,4 +45,5 @@ public interface SeriesStyle {
 
 	MarkerStyle getMarkerStyle();
 
+    double getMarkerSize();
 }
diff --git a/src/main/java/org/scijava/plot/defaultplot/DefaultPlotService.java b/src/main/java/org/scijava/plot/defaultplot/DefaultPlotService.java
@@ -53,8 +53,8 @@ public class DefaultPlotService extends AbstractService implements PlotService {
 	// -- PlotService methods --
 
 	@Override
-	public SeriesStyle newSeriesStyle(ColorRGB color, LineStyle lineStyle, MarkerStyle markerStyle) {
-		return new DefaultSeriesStyle(color, lineStyle, markerStyle);
+	public SeriesStyle newSeriesStyle(ColorRGB color, LineStyle lineStyle, MarkerStyle markerStyle, double markerSize) {
+		return new DefaultSeriesStyle(color, lineStyle, markerStyle, markerSize);
 	}
 
 	@Override
diff --git a/src/main/java/org/scijava/plot/defaultplot/DefaultSeriesStyle.java b/src/main/java/org/scijava/plot/defaultplot/DefaultSeriesStyle.java
@@ -42,16 +42,16 @@
 public class DefaultSeriesStyle implements SeriesStyle {
 
 	private final ColorRGB color;
-
-	private final MarkerStyle markerStyle;
-
 	private final LineStyle lineStyle;
+	private final MarkerStyle markerStyle;
+    private final double markerSize;
 
-	public DefaultSeriesStyle(ColorRGB color, LineStyle lineStyle, MarkerStyle markerStyle) {
+	public DefaultSeriesStyle(ColorRGB color, LineStyle lineStyle, MarkerStyle markerStyle, double markerSize) {
 		this.color = color;
 		this.lineStyle = lineStyle;
 		this.markerStyle = markerStyle;
-	}
+        this.markerSize = markerSize;
+    }
 
 	// -- SeriesStype methods --
 
@@ -70,13 +70,18 @@ public MarkerStyle getMarkerStyle() {
 		return markerStyle;
 	}
 
+	@Override
+	public double getMarkerSize() {
+		return markerSize;
+	}
 
 	// -- package-private helpers --
 
 	public static DefaultSeriesStyle emptySeriesStyle() {
 		return EMPTY_SERIES_STYLE;
 	}
 
-	private static final DefaultSeriesStyle EMPTY_SERIES_STYLE = new DefaultSeriesStyle(null, null, null);
+	private static final DefaultSeriesStyle EMPTY_SERIES_STYLE = new DefaultSeriesStyle(null, null, null, 0);
+
 
 }

Original file line number	Diff line number	Diff line change
`@@ -45,4 +45,5 @@ public interface SeriesStyle {`
`45`	`45`
`46`	`46`	`MarkerStyle getMarkerStyle();`
`47`	`47`
	`48`	`+ double getMarkerSize();`
`48`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,8 @@ public class DefaultPlotService extends AbstractService implements PlotService {`
`53`	`53`	`// -- PlotService methods --`
`54`	`54`
`55`	`55`	`@Override`
`56`		`- public SeriesStyle newSeriesStyle(ColorRGB color, LineStyle lineStyle, MarkerStyle markerStyle) {`
`57`		`- return new DefaultSeriesStyle(color, lineStyle, markerStyle);`
	`56`	`+ public SeriesStyle newSeriesStyle(ColorRGB color, LineStyle lineStyle, MarkerStyle markerStyle, double markerSize) {`
	`57`	`+ return new DefaultSeriesStyle(color, lineStyle, markerStyle, markerSize);`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`@Override`