Skip to content

Commit 8edbe0c

Browse files
committed
adjust incomplete period dots for new version
1 parent 75aaca7 commit 8edbe0c

1 file changed

Lines changed: 11 additions & 14 deletions

File tree

  • plugins/CoreVisualizations/javascripts

plugins/CoreVisualizations/javascripts/jqplot.js

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1633,10 +1633,17 @@ RowEvolutionSeriesToggle.prototype.beforeReplot = function () {
16331633
continue;
16341634
}
16351635

1636-
const markerOptions = opts.markerOptions || {};
1637-
1638-
markerOptions.isIncomplete = opts.dataStates[i] && opts.dataStates[i] !== 'complete';
1639-
markerOptions.incompleteFillColor = plot.grid.background;
1636+
const markerOptions = $.extend(true, {}, opts.markerOptions || {});
1637+
const isIncomplete = opts.dataStates[i] && opts.dataStates[i] !== 'complete';
1638+
1639+
if (isIncomplete) {
1640+
const markerStyle = markerOptions.style || this.markerRenderer.style || 'filledCircle';
1641+
const unfilledStyle = markerStyle.replace(/^filled/, '');
1642+
markerOptions.style = unfilledStyle
1643+
? unfilledStyle.charAt(0).toLowerCase() + unfilledStyle.slice(1)
1644+
: 'circle';
1645+
markerOptions.lineWidth = 1;
1646+
}
16401647

16411648
this.markerRenderer.draw(gd[i][0], gd[i][1], ctx, markerOptions);
16421649
}
@@ -1685,16 +1692,6 @@ RowEvolutionSeriesToggle.prototype.beforeReplot = function () {
16851692
ctx.stroke();
16861693
}
16871694

1688-
if (opts.isIncomplete && opts.incompleteFillColor) {
1689-
// graph lines reach into the point
1690-
// render inner point filled with background color to avoid showing them
1691-
ctx.beginPath();
1692-
ctx.arc(points[0], points[1], points[2] / 8, points[3], points[4], true);
1693-
ctx.strokeStyle = opts.incompleteFillColor;
1694-
ctx.stroke();
1695-
ctx.closePath();
1696-
}
1697-
16981695
ctx.restore();
16991696
return;
17001697
}

0 commit comments

Comments
 (0)