Early parse, stack by parsed value instead of index

src/controllers/controller.bar.js

@@ -257,7 +257,7 @@ module.exports = DatasetController.extend({
 		var i, ilen, min;
 
 		for (i = 0, ilen = me.getMeta().data.length; i < ilen; ++i) {
-			pixels.push(scale.getPixelForValue(null, i, datasetIndex));
+			pixels.push(scale._getPixelForIndex(i, datasetIndex));
 		}
 
 		min = helpers.isNullOrUndef(scale.options.barThickness)
@@ -283,9 +283,10 @@ module.exports = DatasetController.extend({
 		var chart = me.chart;
 		var meta = me.getMeta();
 		var scale = me._getValueScale();
+		var indexScale = me._getIndexScale();
 		var isHorizontal = scale.isHorizontal();
-		var datasets = chart.data.datasets;
-		var value = +scale.getRightValue(datasets[datasetIndex].data[index]);
+		var value = me._getParsedValue(index, scale);
+		var indexValue = me._getParsedValue(index, indexScale);
 		var minBarLength = scale.options.minBarLength;
 		var stacked = scale.options.stacked;
 		var stack = meta.stack;
@@ -296,21 +297,17 @@ module.exports = DatasetController.extend({
 			for (i = 0; i < datasetIndex; ++i) {
 				imeta = chart.getDatasetMeta(i);
 
-				if (imeta.bar &&
-					imeta.stack === stack &&
-					imeta.controller._getValueScaleId() === scale.id &&
-					chart.isDatasetVisible(i)) {
-
-					ivalue = +scale.getRightValue(datasets[i].data[index]);
-					if ((value < 0 && ivalue < 0) || (value >= 0 && ivalue > 0)) {
+				if (imeta.bar && imeta.stack === stack && chart.isDatasetVisible(i)) {
+					ivalue = imeta.controller._getParsedValueByScaleValue(indexValue, indexScale);
+					if (((value < 0 && ivalue < 0) || (value >= 0 && ivalue > 0))) {
 						start += ivalue;
 					}
 				}
 			}
 		}
 
-		base = scale.getPixelForValue(start);
-		head = scale.getPixelForValue(start + value);
+		base = scale._getPixel(start);
+		head = scale._getPixel(start + value);
 		size = head - base;
 
 		if (minBarLength !== undefined && Math.abs(size) < minBarLength) {
@@ -359,14 +356,13 @@ module.exports = DatasetController.extend({
 		var chart = me.chart;
 		var scale = me._getValueScale();
 		var rects = me.getMeta().data;
-		var dataset = me.getDataset();
 		var ilen = rects.length;
 		var i = 0;
 
 		helpers.canvas.clipArea(chart.ctx, chart.chartArea);
 
 		for (; i < ilen; ++i) {
-			if (!isNaN(scale.getRightValue(dataset.data[i]))) {
+			if (!isNaN(me._getParsedValue(i, scale))) {
 				rects[i].draw();
 			}
 		}

src/controllers/controller.bubble.js

@@ -42,6 +42,13 @@ defaults._set('bubble', {
 });
 
 module.exports = DatasetController.extend({
+	/**
+	 * @private
+	 */
+	_parseCustomObjectData: function(obj) {
+		return obj && obj.r && +obj.r;
+	},
+
 	/**
 	 * @protected
 	 */
@@ -71,11 +78,10 @@ module.exports = DatasetController.extend({
 		var xScale = me.getScaleForId(meta.xAxisID);
 		var yScale = me.getScaleForId(meta.yAxisID);
 		var options = me._resolveElementOptions(point, index);
-		var data = me.getDataset().data[index];
 		var dsIndex = me.index;
 
-		var x = reset ? xScale.getPixelForDecimal(0.5) : xScale.getPixelForValue(typeof data === 'object' ? data : NaN, index, dsIndex);
-		var y = reset ? yScale.getBasePixel() : yScale.getPixelForValue(data, index, dsIndex);
+		var x = reset ? xScale.getPixelForDecimal(0.5) : xScale._getPixel(point._parsed[xScale.id]);
+		var y = reset ? yScale.getBasePixel() : yScale._getPixel(point._parsed[yScale.id]);
 
 		point._xScale = xScale;
 		point._yScale = yScale;
@@ -129,7 +135,6 @@ module.exports = DatasetController.extend({
 		var dataset = datasets[me.index];
 		var custom = point.custom || {};
 		var options = chart.options.elements.point;
-		var data = dataset.data[index];
 		var values = {};
 		var i, ilen, key;
 
@@ -166,7 +171,7 @@ module.exports = DatasetController.extend({
 		// Custom radius resolution
 		values.radius = resolve([
 			custom.radius,
-			data ? data.r : undefined,
+			me._getParsedCustom(index),
 			dataset.radius,
 			options.radius
 		], context, index);

src/controllers/controller.doughnut.js

@@ -127,6 +127,16 @@ module.exports = DatasetController.extend({
 
 	linkScales: helpers.noop,
 
+	_parse: function(start, count) {
+		var me = this;
+		var data = me.getDataset().data;
+		var metaData = me.getMeta().data;
+		var i, ilen;
+		for (i = start, ilen = start + count; i < ilen; ++i) {
+			metaData[i]._val = +data[i];
+		}
+	},
+
 	// Get index of the dataset in relation to the visible datasets. This allows determining the inner and outer radius correctly
 	getRingIndex: function(datasetIndex) {
 		var ringIndex = 0;
@@ -207,7 +217,7 @@ module.exports = DatasetController.extend({
 		var startAngle = opts.rotation; // non reset case handled later
 		var endAngle = opts.rotation; // non reset case handled later
 		var dataset = me.getDataset();
-		var circumference = reset && animationOpts.animateRotate ? 0 : arc.hidden ? 0 : me.calculateCircumference(dataset.data[index]) * (opts.circumference / (2.0 * Math.PI));
+		var circumference = reset && animationOpts.animateRotate ? 0 : arc.hidden ? 0 : me.calculateCircumference(arc._val) * (opts.circumference / (2.0 * Math.PI));
 		var innerRadius = reset && animationOpts.animateScale ? 0 : me.innerRadius;
 		var outerRadius = reset && animationOpts.animateScale ? 0 : me.outerRadius;
 		var options = arc._options || {};
@@ -251,14 +261,13 @@ module.exports = DatasetController.extend({
 	},
 
 	calculateTotal: function() {
-		var dataset = this.getDataset();
-		var meta = this.getMeta();
+		var metaData = this.getMeta().data;
 		var total = 0;
 		var value;
 
-		helpers.each(meta.data, function(element, index) {
-			value = dataset.data[index];
-			if (!isNaN(value) && !element.hidden) {
+		helpers.each(metaData, function(arc) {
+			value = arc ? arc._val : NaN;
+			if (!isNaN(value) && !arc.hidden) {
 				total += Math.abs(value);
 			}
 		});

src/controllers/controller.line.js

@@ -86,18 +86,16 @@ module.exports = DatasetController.extend({
 		var me = this;
 		var meta = me.getMeta();
 		var custom = point.custom || {};
-		var dataset = me.getDataset();
 		var datasetIndex = me.index;
-		var value = dataset.data[index];
 		var yScale = me.getScaleForId(meta.yAxisID);
 		var xScale = me.getScaleForId(meta.xAxisID);
 		var lineModel = meta.dataset._model;
 		var x, y;
 
 		var options = me._resolvePointOptions(point, index);
 
-		x = xScale.getPixelForValue(typeof value === 'object' ? value : NaN, index, datasetIndex);
-		y = reset ? yScale.getBasePixel() : me.calculatePointY(value, index, datasetIndex);
+		x = xScale.getPixelForValue(me._getParsedValue(index, xScale), index, datasetIndex);
+		y = reset ? yScale.getBasePixel() : me.calculatePointY(me._getParsedValue(index, yScale), index, datasetIndex);
 
 		// Utility
 		point._xScale = xScale;
@@ -224,30 +222,28 @@ module.exports = DatasetController.extend({
 		var yScale = me.getScaleForId(meta.yAxisID);
 		var sumPos = 0;
 		var sumNeg = 0;
-		var i, ds, dsMeta;
+		var i, dsMeta;
 
 		if (yScale.options.stacked) {
 			for (i = 0; i < datasetIndex; i++) {
-				ds = chart.data.datasets[i];
 				dsMeta = chart.getDatasetMeta(i);
-				if (dsMeta.type === 'line' && dsMeta.yAxisID === yScale.id && chart.isDatasetVisible(i)) {
-					var stackedRightValue = Number(yScale.getRightValue(ds.data[index]));
+				if (dsMeta.type === 'line' && chart.isDatasetVisible(i)) {
+					var stackedRightValue = dsMeta.controller._getParsedValue(index, yScale);
 					if (stackedRightValue < 0) {
 						sumNeg += stackedRightValue || 0;
-					} else {
+					} else if (stackedRightValue > 0) {
 						sumPos += stackedRightValue || 0;
 					}
 				}
 			}
 
-			var rightValue = Number(yScale.getRightValue(value));
-			if (rightValue < 0) {
-				return yScale.getPixelForValue(sumNeg + rightValue);
+			if (value < 0) {
+				return yScale._getPixel(sumNeg + value);
 			}
-			return yScale.getPixelForValue(sumPos + rightValue);
+			return yScale._getPixel(sumPos + value);
 		}
 
-		return yScale.getPixelForValue(value);
+		return yScale._getPixel(value);
 	},
 
 	updateBezierControlPoints: function() {

src/controllers/controller.polarArea.js

@@ -116,6 +116,14 @@ module.exports = DatasetController.extend({
 
 	linkScales: helpers.noop,
 
+	_getIndexScaleId: function() {
+		return this.chart.scale.id;
+	},
+
+	_getValueScaleId: function() {
+		return this.chart.scale.id;
+	},
+
 	update: function(reset) {
 		var me = this;
 		var dataset = me.getDataset();

src/controllers/controller.radar.js

@@ -27,6 +27,14 @@ module.exports = DatasetController.extend({
 
 	linkScales: helpers.noop,
 
+	_getIndexScaleId: function() {
+		return this.chart.scale.id;
+	},
+
+	_getValueScaleId: function() {
+		return this.chart.scale.id;
+	},
+
 	update: function(reset) {
 		var me = this;
 		var meta = me.getMeta();