Skip to content
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

Jump to bottom

Reuse _parsed #6756

Closed
wants to merge 1 commit into from
Closed

Reuse _parsed #6756

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
29 changes: 11 additions & 18 deletions src/controllers/controller.bar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,27 +153,23 @@ function parseFloatBar(arr, item, vScale, i) {
}

function parseArrayOrPrimitive(meta, data, start, count) {
var iScale = this._getIndexScale();
var vScale = this._getValueScale();
var labels = iScale._getLabels();
var singleScale = iScale === vScale;
var parsed = [];
var i, ilen, item, entry;
const iScale = meta._indexScale;
const vScale = meta._valueScale;
const labels = iScale._getLabels();
const singleScale = iScale === vScale;
let i, ilen, item, entry;

for (i = start, ilen = start + count; i < ilen; ++i) {
entry = data[i];
item = {};
item = meta.data[i]._parsed;
item[iScale.id] = singleScale || iScale._parse(labels[i], i);

if (helpers.isArray(entry)) {
parseFloatBar(entry, item, vScale, i);
} else {
item[vScale.id] = vScale._parse(entry, i);
}

parsed.push(item);
}
return parsed;
}

module.exports = DatasetController.extend({
Expand Down Expand Up @@ -219,24 +215,21 @@ module.exports = DatasetController.extend({
* @private
*/
_parseObjectData: function(meta, data, start, count) {
var iScale = this._getIndexScale();
var vScale = this._getValueScale();
var vProp = vScale._getAxis();
var parsed = [];
var i, ilen, item, obj, value;
const iScale = meta._indexScale;
const vScale = meta._valueScale;
const vProp = vScale._getAxis();
let i, ilen, item, obj, value;
for (i = start, ilen = start + count; i < ilen; ++i) {
obj = data[i];
item = {};
item = meta.data[i]._parsed;
item[iScale.id] = iScale._parseObject(obj, iScale._getAxis(), i);
value = obj[vProp];
if (helpers.isArray(value)) {
parseFloatBar(value, item, vScale, i);
} else {
item[vScale.id] = vScale._parseObject(obj, vProp, i);
}
parsed.push(item);
}
return parsed;
},

/**
Expand Down
11 changes: 4 additions & 7 deletions src/controllers/controller.bubble.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,19 +59,16 @@ module.exports = DatasetController.extend({
* @private
*/
_parseObjectData: function(meta, data, start, count) {
var xScale = this.getScaleForId(meta.xAxisID);
var yScale = this.getScaleForId(meta.yAxisID);
var parsed = [];
var i, ilen, item, obj;
const xScale = meta._xScale;
const yScale = meta._yScale;
let i, ilen, item, obj;
for (i = start, ilen = start + count; i < ilen; ++i) {
obj = data[i];
item = {};
item = meta.data[i]._parsed;
item[xScale.id] = xScale._parseObject(obj, 'x', i);
item[yScale.id] = yScale._parseObject(obj, 'y', i);
item._custom = obj && obj.r && +obj.r;
parsed.push(item);
}
return parsed;
},

/**
Expand Down
130 changes: 66 additions & 64 deletions src/core/core.datasetController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,41 @@ function getStackKey(indexScale, valueScale, meta) {
return indexScale.id + '.' + valueScale.id + '.' + meta.stack + '.' + meta.type;
}

function updateStacks(chart, meta, start, count) {
const stacks = chart._stacks || (chart._stacks = {}); // map structure is {stackKey: {datasetIndex: value}}
const xScale = meta._indexScale;
const yScale = meta._valueScale;
const xId = xScale.id;
const yId = yScale.id;
const xStacked = isStacked(xScale, meta);
const yStacked = isStacked(yScale, meta);
const xKey = yStacked && getStackKey(xScale, yScale, meta);
const yKey = xStacked && getStackKey(yScale, xScale, meta);
var i, ilen, stack, item, x, y;

function storeStack(stackKey, indexValue, scaleId, value) {
stackKey += '.' + indexValue;
item._stackKeys[scaleId] = stackKey;
stack = stacks[stackKey] || (stacks[stackKey] = {});
stack[meta.index] = value;
}

for (i = start, ilen = start + count; i < ilen; ++i) {
item = meta.data[i]._parsed;

item._stackKeys = {};
x = item[xId];
y = item[yId];

if (yStacked) {
storeStack(xKey, x, yId, y);
}
if (xStacked) {
storeStack(yKey, y, xId, x);
}
}
}

function getFirstScaleId(chart, axis) {
var scalesOpts = chart.options.scales;
var scale = chart.options.scale;
Expand Down Expand Up @@ -248,7 +283,7 @@ helpers.extend(DatasetController.prototype, {
me._cachedMeta = meta = me.getMeta();
me._type = meta.type;
me.linkScales();
meta._stacked = isStacked(me._getValueScale(), meta);
meta._stacked = isStacked(meta._valueScale, meta);
me.addElements();
},

Expand All @@ -257,12 +292,17 @@ helpers.extend(DatasetController.prototype, {
},

linkScales: function() {
var chart = this.chart;
var meta = this._cachedMeta;
var dataset = this.getDataset();
const me = this;
const chart = me.chart;
const meta = me._cachedMeta;
const dataset = me.getDataset();

meta.xAxisID = dataset.xAxisID || getFirstScaleId(chart, 'x');
meta.yAxisID = dataset.yAxisID || getFirstScaleId(chart, 'y');
meta._indexScale = me._getIndexScale();
meta._valueScale = me._getValueScale();
meta._xScale = me.getScaleForId(meta.xAxisID);
meta._yScale = me.getScaleForId(meta.yAxisID);
},

getDataset: function() {
Expand Down Expand Up @@ -464,49 +504,20 @@ helpers.extend(DatasetController.prototype, {
const chart = me.chart;
const meta = me._cachedMeta;
const data = me._data;
const stacks = chart._stacks || (chart._stacks = {}); // map structure is {stackKey: {datasetIndex: value}}
const xScale = me._getIndexScale();
const yScale = me._getValueScale();
const xId = xScale.id;
const yId = yScale.id;
const xStacked = isStacked(xScale, meta);
const yStacked = isStacked(yScale, meta);
const xKey = yStacked && getStackKey(xScale, yScale, meta);
const yKey = xStacked && getStackKey(yScale, xScale, meta);
const stacked = xStacked || yStacked;
var i, ilen, parsed, stack, item, x, y;
const xScale = meta._indexScale;
const yScale = meta._valueScale;
const stacked = isStacked(xScale, meta) || isStacked(yScale, meta);

if (helpers.isArray(data[start])) {
parsed = me._parseArrayData(meta, data, start, count);
me._parseArrayData(meta, data, start, count);
} else if (helpers.isObject(data[start])) {
parsed = me._parseObjectData(meta, data, start, count);
me._parseObjectData(meta, data, start, count);
} else {
parsed = me._parsePrimitiveData(meta, data, start, count);
me._parsePrimitiveData(meta, data, start, count);
}

function storeStack(stackKey, indexValue, scaleId, value) {
stackKey += '.' + indexValue;
item._stackKeys[scaleId] = stackKey;
stack = stacks[stackKey] || (stacks[stackKey] = {});
stack[meta.index] = value;
}

for (i = 0, ilen = parsed.length; i < ilen; ++i) {
item = parsed[i];
meta.data[start + i]._parsed = item;

if (stacked) {
item._stackKeys = {};
x = item[xId];
y = item[yId];

if (yStacked) {
storeStack(xKey, x, yId, y);
}
if (xStacked) {
storeStack(yKey, y, xId, x);
}
}
if (stacked) {
updateStacks(chart, meta, start, count);
}

xScale._invalidateCaches();
Expand All @@ -527,20 +538,17 @@ helpers.extend(DatasetController.prototype, {
* @private
*/
_parsePrimitiveData: function(meta, data, start, count) {
var iScale = this._getIndexScale();
var vScale = this._getValueScale();
var labels = iScale._getLabels();
var singleScale = iScale === vScale;
var parsed = [];
var i, ilen, item;
const iScale = meta._indexScale;
const vScale = meta._valueScale;
const labels = iScale._getLabels();
const singleScale = iScale === vScale;
let i, ilen, item;

for (i = start, ilen = start + count; i < ilen; ++i) {
item = {};
item = meta.data[i]._parsed;
item[iScale.id] = singleScale || iScale._parse(labels[i], i);
item[vScale.id] = vScale._parse(data[i], i);
parsed.push(item);
}
return parsed;
},

/**
Expand All @@ -555,18 +563,15 @@ helpers.extend(DatasetController.prototype, {
* @private
*/
_parseArrayData: function(meta, data, start, count) {
var xScale = this.getScaleForId(meta.xAxisID);
var yScale = this.getScaleForId(meta.yAxisID);
var parsed = [];
var i, ilen, item, arr;
const xScale = meta._xScale;
const yScale = meta._yScale;
let i, ilen, item, arr;
for (i = start, ilen = start + count; i < ilen; ++i) {
arr = data[i];
item = {};
item = meta.data[i]._parsed;
item[xScale.id] = xScale._parse(arr[0], i);
item[yScale.id] = yScale._parse(arr[1], i);
parsed.push(item);
}
return parsed;
},

/**
Expand All @@ -581,18 +586,15 @@ helpers.extend(DatasetController.prototype, {
* @private
*/
_parseObjectData: function(meta, data, start, count) {
var xScale = this.getScaleForId(meta.xAxisID);
var yScale = this.getScaleForId(meta.yAxisID);
var parsed = [];
var i, ilen, item, obj;
const xScale = meta._xScale;
const yScale = meta._yScale;
let i, ilen, item, obj;
for (i = start, ilen = start + count; i < ilen; ++i) {
obj = data[i];
item = {};
item = meta.data[i]._parsed;
item[xScale.id] = xScale._parseObject(obj, 'x', i);
item[yScale.id] = yScale._parseObject(obj, 'y', i);
parsed.push(item);
}
return parsed;
},

/**
Expand Down