Skip to content

Commit 1857240

Browse files
committed
adjust incomplete period dots for new version
1 parent 8eb02cc commit 1857240

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
@@ -1597,10 +1597,17 @@ RowEvolutionSeriesToggle.prototype.beforeReplot = function () {
15971597
continue;
15981598
}
15991599

1600-
const markerOptions = opts.markerOptions || {};
1601-
1602-
markerOptions.isIncomplete = opts.dataStates[i] && opts.dataStates[i] !== 'complete';
1603-
markerOptions.incompleteFillColor = plot.grid.background;
1600+
const markerOptions = $.extend(true, {}, opts.markerOptions || {});
1601+
const isIncomplete = opts.dataStates[i] && opts.dataStates[i] !== 'complete';
1602+
1603+
if (isIncomplete) {
1604+
const markerStyle = markerOptions.style || this.markerRenderer.style || 'filledCircle';
1605+
const unfilledStyle = markerStyle.replace(/^filled/, '');
1606+
markerOptions.style = unfilledStyle
1607+
? unfilledStyle.charAt(0).toLowerCase() + unfilledStyle.slice(1)
1608+
: 'circle';
1609+
markerOptions.lineWidth = 1;
1610+
}
16041611

16051612
this.markerRenderer.draw(gd[i][0], gd[i][1], ctx, markerOptions);
16061613
}
@@ -1649,16 +1656,6 @@ RowEvolutionSeriesToggle.prototype.beforeReplot = function () {
16491656
ctx.stroke();
16501657
}
16511658

1652-
if (opts.isIncomplete && opts.incompleteFillColor) {
1653-
// graph lines reach into the point
1654-
// render inner point filled with background color to avoid showing them
1655-
ctx.beginPath();
1656-
ctx.arc(points[0], points[1], points[2] / 8, points[3], points[4], true);
1657-
ctx.strokeStyle = opts.incompleteFillColor;
1658-
ctx.stroke();
1659-
ctx.closePath();
1660-
}
1661-
16621659
ctx.restore();
16631660
return;
16641661
}

0 commit comments

Comments
 (0)