Skip to content

Commit 6398c60

Browse files
committed
Update charts.
1 parent 28b93b1 commit 6398c60

File tree

10 files changed

+16
-17
lines changed

10 files changed

+16
-17
lines changed

sierra-test/src/main/java/org/httprpc/sierra/test/ChartsTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,8 @@ private ScatterChart<Integer, Double> createScatterChart() {
305305
for (var i = 0; i < m; i++) {
306306
var dataSet = new DataSet<Integer, Double>(String.format("Group %d", i + 1), colors.get(i));
307307

308+
dataSet.setStroke(new BasicStroke(1.0f));
309+
308310
var dataPoints = new TreeMap<Integer, Double>();
309311

310312
var previousValue = i * 25.0;

sierra/src/main/java/org/httprpc/sierra/charts/ScatterChart.java

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
package org.httprpc.sierra.charts;
1616

1717
import javax.swing.Icon;
18-
import java.awt.BasicStroke;
1918
import java.awt.Component;
2019
import java.awt.Graphics;
2120
import java.awt.Graphics2D;
@@ -69,12 +68,14 @@ public void paintIcon(Component component, Graphics graphics, int x, int y) {
6968
}
7069

7170
private void paintIcon(Graphics2D graphics, int x, int y) {
72-
var lineWidth = outlineStroke.getLineWidth();
71+
var stroke = dataSet.getStroke();
72+
73+
var lineWidth = stroke.getLineWidth();
7374

7475
shape.setFrame(x + lineWidth / 2, y + lineWidth / 2, SIZE - lineWidth, SIZE - lineWidth);
7576

7677
graphics.setColor(dataSet.getColor());
77-
graphics.setStroke(outlineStroke);
78+
graphics.setStroke(stroke);
7879

7980
graphics.draw(shape);
8081
}
@@ -100,11 +101,6 @@ public int getIconHeight() {
100101

101102
private static final int VALUE_MARKER_SIZE = 10;
102103

103-
private static final BasicStroke outlineStroke;
104-
static {
105-
outlineStroke = new BasicStroke(1.0f);
106-
}
107-
108104
/**
109105
* Constructs a new scatter chart.
110106
*
@@ -248,6 +244,7 @@ protected void draw(Graphics2D graphics) {
248244

249245
for (var dataSet : getDataSets()) {
250246
var color = dataSet.getColor();
247+
var stroke = dataSet.getStroke();
251248

252249
var fillColor = colorWithAlpha(color, (int)(valueMarkerTransparency * 255));
253250

@@ -257,7 +254,7 @@ protected void draw(Graphics2D graphics) {
257254
graphics.fill(valueMarkerShape);
258255

259256
graphics.setColor(color);
260-
graphics.setStroke(outlineStroke);
257+
graphics.setStroke(stroke);
261258

262259
graphics.draw(valueMarkerShape);
263260
}

sierra/src/test/resources/org/httprpc/sierra/charts/scatter-chart-domain-markers.svg

Lines changed: 1 addition & 1 deletion
Loading

sierra/src/test/resources/org/httprpc/sierra/charts/scatter-chart-mixed-values.svg

Lines changed: 1 addition & 1 deletion
Loading

sierra/src/test/resources/org/httprpc/sierra/charts/scatter-chart-negative-values.svg

Lines changed: 1 addition & 1 deletion
Loading

sierra/src/test/resources/org/httprpc/sierra/charts/scatter-chart-one-value.svg

Lines changed: 1 addition & 1 deletion
Loading

sierra/src/test/resources/org/httprpc/sierra/charts/scatter-chart-positive-values.svg

Lines changed: 1 addition & 1 deletion
Loading

sierra/src/test/resources/org/httprpc/sierra/charts/scatter-chart-range-markers.svg

Lines changed: 1 addition & 1 deletion
Loading

sierra/src/test/resources/org/httprpc/sierra/charts/scatter-chart-trend-lines.svg

Lines changed: 1 addition & 1 deletion
Loading

sierra/src/test/resources/org/httprpc/sierra/charts/scatter-chart-zero-values.svg

Lines changed: 1 addition & 1 deletion
Loading

0 commit comments

Comments
 (0)