archive-gh-me/Chart.js
1
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2025-12-08 20:36:08 +00:00
Code Issues Projects Releases Wiki Activity

Reuse parsed results rather than redoing work

Browse Source 
The input labels/data is converted into moments in `determineDataLimits`, reuse them instead of duplicating the work.
This commit is contained in:
Thomas Redston 2017-01-24 18:06:18 +00:00 committed by Evert Timberg
parent 074ab2aa87
commit 9f3b51a80c
2 changed files with 27 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
src/scales/scale.time.js
View File

@ -76,17 +76,6 @@ module.exports = function(Chart) {
Chart.Scale.prototype.initialize.call(this); Chart.Scale.prototype.initialize.call(this);
}, },
getLabelMoment: function(datasetIndex, index) {
if (datasetIndex === null || index === null) {
return null;
}
if (typeof this.labelMoments[datasetIndex] !== 'undefined') {
return this.labelMoments[datasetIndex][index];
}
return null;
},
getLabelDiff: function(datasetIndex, index) { getLabelDiff: function(datasetIndex, index) {
var me = this; var me = this;
if (datasetIndex === null || index === null) { if (datasetIndex === null || index === null) {
@ -114,23 +103,26 @@ module.exports = function(Chart) {
var me = this; var me = this;
me.labelMoments = []; me.labelMoments = [];
function appendLabel(array, label) {
var labelMoment = me.parseTime(label);
if (labelMoment.isValid()) {
if (me.options.time.round) {
labelMoment.startOf(me.options.time.round);
}
array.push(labelMoment);
}
}
// Only parse these once. If the dataset does not have data as x,y pairs, we will use // Only parse these once. If the dataset does not have data as x,y pairs, we will use
// these // these
var scaleLabelMoments = []; var scaleLabelMoments = [];
if (me.chart.data.labels && me.chart.data.labels.length > 0) { if (me.chart.data.labels && me.chart.data.labels.length > 0) {
helpers.each(me.chart.data.labels, function(label) { helpers.each(me.chart.data.labels, function(label) {
var labelMoment = me.parseTime(label); appendLabel(scaleLabelMoments, label);
if (labelMoment.isValid()) {
if (me.options.time.round) {
labelMoment.startOf(me.options.time.round);
}
scaleLabelMoments.push(labelMoment);
}
}, me); }, me);
me.firstTick = moment.min.call(me, scaleLabelMoments); me.firstTick = moment.min(scaleLabelMoments);
me.lastTick = moment.max.call(me, scaleLabelMoments); me.lastTick = moment.max(scaleLabelMoments);
} else { } else {
me.firstTick = null; me.firstTick = null;
me.lastTick = null; me.lastTick = null;
@ -138,25 +130,19 @@ module.exports = function(Chart) {
helpers.each(me.chart.data.datasets, function(dataset, datasetIndex) { helpers.each(me.chart.data.datasets, function(dataset, datasetIndex) {
var momentsForDataset = []; var momentsForDataset = [];
var datasetVisible = me.chart.isDatasetVisible(datasetIndex);
if (typeof dataset.data[0] === 'object' && dataset.data[0] !== null) { if (typeof dataset.data[0] === 'object' && dataset.data[0] !== null) {
helpers.each(dataset.data, function(value) { helpers.each(dataset.data, function(value) {
var labelMoment = me.parseTime(me.getRightValue(value)); appendLabel(momentsForDataset, me.getRightValue(value));
if (labelMoment.isValid()) {
if (me.options.time.round) {
labelMoment.startOf(me.options.time.round);
}
momentsForDataset.push(labelMoment);
if (datasetVisible) {
// May have gone outside the scale ranges, make sure we keep the first and last ticks updated
me.firstTick = me.firstTick !== null ? moment.min(me.firstTick, labelMoment) : labelMoment;
me.lastTick = me.lastTick !== null ? moment.max(me.lastTick, labelMoment) : labelMoment;
}
}
}, me); }, me);
if (me.chart.isDatasetVisible(datasetIndex)) {
// May have gone outside the scale ranges, make sure we keep the first and last ticks updated
var min = moment.min(momentsForDataset);
var max = moment.max(momentsForDataset);
me.firstTick = me.firstTick !== null ? moment.min(me.firstTick, min) : min;
me.lastTick = me.lastTick !== null ? moment.max(me.lastTick, max) : max;
}
} else { } else {
// We have no labels. Use the ones from the scale // We have no labels. Use the ones from the scale
momentsForDataset = scaleLabelMoments; momentsForDataset = scaleLabelMoments;
@ -180,43 +166,12 @@ module.exports = function(Chart) {
}, },
buildLabelDiffs: function() { buildLabelDiffs: function() {
var me = this; var me = this;
me.labelDiffs = [];
var scaleLabelDiffs = [];
// Parse common labels once
if (me.chart.data.labels && me.chart.data.labels.length > 0) {
helpers.each(me.chart.data.labels, function(label) {
var labelMoment = me.parseTime(label);
if (labelMoment.isValid()) { me.labelDiffs = me.labelMoments.map(function(datasetLabels) {
if (me.options.time.round) { return datasetLabels.map(function(label) {
labelMoment.startOf(me.options.time.round); return label.diff(me.firstTick, me.tickUnit, true);
} });
scaleLabelDiffs.push(labelMoment.diff(me.firstTick, me.tickUnit, true)); });
}
}, me);
}
helpers.each(me.chart.data.datasets, function(dataset) {
var diffsForDataset = [];
if (typeof dataset.data[0] === 'object' && dataset.data[0] !== null) {
helpers.each(dataset.data, function(value) {
var labelMoment = me.parseTime(me.getRightValue(value));
if (labelMoment.isValid()) {
if (me.options.time.round) {
labelMoment.startOf(me.options.time.round);
}
diffsForDataset.push(labelMoment.diff(me.firstTick, me.tickUnit, true));
}
}, me);
} else {
// We have no labels. Use common ones
diffsForDataset = scaleLabelDiffs;
}
me.labelDiffs.push(diffsForDataset);
}, me);
}, },
buildTicks: function() { buildTicks: function() {
var me = this; var me = this;

64
test/scale.time.tests.js
View File

@ -485,68 +485,4 @@ describe('Time scale tests', function() {
threshold: 0.75 threshold: 0.75
}); });
}); });
it('should not throw an error if the datasetIndex is out of bounds', function() {
var chart = window.acquireChart({
type: 'line',
data: {
labels: ['2016-06-26'],
datasets: [{
xAxisID: 'xScale0',
data: [5]
}]
},
options: {
scales: {
xAxes: [{
id: 'xScale0',
display: true,
type: 'time',
}]
}
}
});
var xScale = chart.scales.xScale0;
var getOutOfBoundLabelMoment = function() {
xScale.getLabelMoment(12, 0);
};
expect(getOutOfBoundLabelMoment).not.toThrow();
});
it('should not throw an error if the datasetIndex or index are null', function() {
var chart = window.acquireChart({
type: 'line',
data: {
labels: ['2016-06-26'],
datasets: [{
xAxisID: 'xScale0',
data: [5]
}]
},
options: {
scales: {
xAxes: [{
id: 'xScale0',
display: true,
type: 'time',
}]
}
}
});
var xScale = chart.scales.xScale0;
var getNullDatasetIndexLabelMoment = function() {
xScale.getLabelMoment(null, 1);
};
var getNullIndexLabelMoment = function() {
xScale.getLabelMoment(1, null);
};
expect(getNullDatasetIndexLabelMoment).not.toThrow();
expect(getNullIndexLabelMoment).not.toThrow();
});
}); });