Skip to content

Better handling of mixed line / scatter charts #5151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Better handling of mixed line / scatter charts #5151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions src/controllers/controller.line.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ var elements = require('../elements/index');
var helpers = require('../helpers/index');

defaults._set('line', {
showLines: true,
spanGaps: false,

hover: {
Expand All @@ -26,10 +25,6 @@ defaults._set('line', {

module.exports = function(Chart) {

function lineEnabled(dataset, options) {
return helpers.valueOrDefault(dataset.showLine, options.showLines);
}

Chart.controllers.line = Chart.DatasetController.extend({

datasetElementType: elements.Line,
Expand All @@ -46,7 +41,7 @@ module.exports = function(Chart) {
var scale = me.getScaleForId(meta.yAxisID);
var i, ilen, custom;
var dataset = me.getDataset();
var showLine = lineEnabled(dataset, options);
var showLine = me._lineEnabled(dataset, options);

// Update Line
if (showLine) {
Expand Down Expand Up @@ -300,7 +295,7 @@ module.exports = function(Chart) {
var halfBorderWidth;
var i = 0;

if (lineEnabled(me.getDataset(), chart.options)) {
if (me._lineEnabled(me.getDataset(), chart.options)) {
halfBorderWidth = (meta.dataset._model.borderWidth || 0) / 2;

helpers.canvas.clipArea(chart.ctx, {
Expand Down Expand Up @@ -340,5 +335,13 @@ module.exports = function(Chart) {
model.borderWidth = custom.hoverBorderWidth || helpers.valueAtIndexOrDefault(dataset.pointHoverBorderWidth, index, model.borderWidth);
model.radius = custom.hoverRadius || helpers.valueAtIndexOrDefault(dataset.pointHoverRadius, index, this.chart.options.elements.point.hoverRadius);
},

/**
* To be called only by scatter chart
* @private
*/
_lineEnabled: function(dataset, options) {
return helpers.valueOrDefault(dataset.showLine, helpers.valueOrDefault(options.showLines, true));
}
});
};
15 changes: 11 additions & 4 deletions src/controllers/controller.scatter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
'use strict';

var defaults = require('../core/core.defaults');
var helpers = require('../helpers/index');

defaults._set('scatter', {
hover: {
Expand All @@ -20,8 +21,6 @@ defaults._set('scatter', {
}]
},

showLines: false,

tooltips: {
callbacks: {
title: function() {
Expand All @@ -36,7 +35,15 @@ defaults._set('scatter', {

module.exports = function(Chart) {

// Scatter charts use line controllers
Chart.controllers.scatter = Chart.controllers.line;
Chart.controllers.scatter = Chart.controllers.line.extend({

/**
* @private
*/
_lineEnabled: function(dataset, options) {
return helpers.valueOrDefault(dataset.showLine, helpers.valueOrDefault(options.showLines, false));
}

});

};
1 change: 0 additions & 1 deletion src/core/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ defaults._set('global', {
defaultFontFamily: "'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",
defaultFontSize: 12,
defaultFontStyle: 'normal',
showLines: true,

// Element defaults defined in element extensions
elements: {},
Expand Down