+
@@ -53,14 +53,14 @@
stacked: false,
scales: {
xAxes: [{
- display: false,
+ display: true,
gridLines: {
offsetGridLines: false
}
}],
yAxes: [{
type: "linear", // only linear but allow scale type registration. This allows extensions to exist solely for log scale for instance
- display: false,
+ display: true,
position: "left",
id: "y-axis-1",
@@ -91,7 +91,7 @@
}
}, {
type: "linear", // only linear but allow scale type registration. This allows extensions to exist solely for log scale for instance
- display: false,
+ display: true,
position: "right",
id: "y-axis-2",
diff --git a/src/charts/chart.bar.js b/src/charts/chart.bar.js
index cfada7c59..23af96b2a 100644
--- a/src/charts/chart.bar.js
+++ b/src/charts/chart.bar.js
@@ -281,34 +281,7 @@
ctx: this.chart.ctx,
options: this.options.scales.xAxes[0],
id: this.options.scales.xAxes[0].id,
- calculateRange: function() {
- this.labels = self.data.labels;
- this.min = 0;
- this.max = this.labels.length;
- },
- calculateBaseWidth: function() {
- return (this.getPixelForValue(null, 1, true) - this.getPixelForValue(null, 0, true)) - (2 * this.options.categorySpacing);
- },
- calculateBarWidth: function(datasetCount) {
- //The padding between datasets is to the right of each bar, providing that there are more than 1 dataset
- var baseWidth = this.calculateBaseWidth() - ((datasetCount - 1) * this.options.spacing);
-
- if (self.options.stacked) {
- return baseWidth;
- }
- return (baseWidth / datasetCount);
- },
- calculateBarX: function(datasetCount, datasetIndex, elementIndex) {
- var xWidth = this.calculateBaseWidth(),
- xAbsolute = this.getPixelForValue(null, elementIndex, true) - (xWidth / 2),
- barWidth = this.calculateBarWidth(datasetCount);
-
- if (self.options.stacked) {
- return xAbsolute + barWidth / 2;
- }
-
- return xAbsolute + (barWidth * datasetIndex) + (datasetIndex * this.options.spacing) + barWidth / 2;
- },
+ data: this.data,
});
this.scales[xScale.id] = xScale;
diff --git a/src/charts/chart.line.js b/src/charts/chart.line.js
index 20a5d495e..b49789ead 100644
--- a/src/charts/chart.line.js
+++ b/src/charts/chart.line.js
@@ -402,11 +402,7 @@
var xScale = new ScaleClass({
ctx: this.chart.ctx,
options: this.options.scales.xAxes[0],
- calculateRange: function() {
- this.labels = self.data.labels;
- this.min = 0;
- this.max = this.labels.length;
- },
+ data: this.data,
id: this.options.scales.xAxes[0].id,
});
this.scales[xScale.id] = xScale;
diff --git a/src/scales/scale.category.js b/src/scales/scale.category.js
index a6d9ad77f..3d96f8e9b 100644
--- a/src/scales/scale.category.js
+++ b/src/scales/scale.category.js
@@ -1,213 +1,235 @@
(function() {
- "use strict";
+ "use strict";
- var root = this,
- Chart = root.Chart,
- helpers = Chart.helpers;
+ var root = this,
+ Chart = root.Chart,
+ helpers = Chart.helpers;
- var DatasetScale = Chart.Element.extend({
- // overridden in the chart. Will set min and max as properties of the scale for later use. Min will always be 0 when using a dataset and max will be the number of items in the dataset
- calculateRange: helpers.noop,
- isHorizontal: function() {
- return this.options.position == "top" || this.options.position == "bottom";
- },
- getPixelForValue: function(value, index, includeOffset) {
- // This must be called after fit has been run so that
- // this.left, this.top, this.right, and this.bottom have been defined
- if (this.isHorizontal()) {
- var isRotated = (this.labelRotation > 0);
- var innerWidth = this.width - (this.paddingLeft + this.paddingRight);
- var valueWidth = innerWidth / Math.max((this.max - ((this.options.gridLines.offsetGridLines) ? 0 : 1)), 1);
- var valueOffset = (valueWidth * index) + this.paddingLeft;
+ var DatasetScale = Chart.Element.extend({
+ isHorizontal: function() {
+ return this.options.position == "top" || this.options.position == "bottom";
+ },
+ getPixelForValue: function(value, index, includeOffset) {
+ // This must be called after fit has been run so that
+ // this.left, this.top, this.right, and this.bottom have been defined
+ if (this.isHorizontal()) {
+ var isRotated = (this.labelRotation > 0);
+ var innerWidth = this.width - (this.paddingLeft + this.paddingRight);
+ var valueWidth = innerWidth / Math.max((this.data.labels.length - ((this.options.gridLines.offsetGridLines) ? 0 : 1)), 1);
+ var valueOffset = (valueWidth * index) + this.paddingLeft;
- if (this.options.gridLines.offsetGridLines && includeOffset) {
- valueOffset += (valueWidth / 2);
- }
+ if (this.options.gridLines.offsetGridLines && includeOffset) {
+ valueOffset += (valueWidth / 2);
+ }
- return this.left + Math.round(valueOffset);
- } else {
- return this.top + (index * (this.height / this.max));
- }
- },
- calculateLabelRotation: function(maxHeight, margins) {
- //Get the width of each grid by calculating the difference
- //between x offsets between 0 and 1.
- var labelFont = helpers.fontString(this.options.labels.fontSize, this.options.labels.fontStyle, this.options.labels.fontFamily);
- this.ctx.font = labelFont;
+ return this.left + Math.round(valueOffset);
+ } else {
+ return this.top + (index * (this.height / this.data.labels.length));
+ }
+ },
+ // For bar charts
+ calculateBaseWidth: function() {
+ return (this.getPixelForValue(null, 1, true) - this.getPixelForValue(null, 0, true)) - (2 * this.options.categorySpacing);
+ },
+ calculateBarWidth: function(datasetCount) {
+ //The padding between datasets is to the right of each bar, providing that there are more than 1 dataset
+ var baseWidth = this.calculateBaseWidth() - ((datasetCount - 1) * this.options.spacing);
- var firstWidth = this.ctx.measureText(this.labels[0]).width;
- var lastWidth = this.ctx.measureText(this.labels[this.labels.length - 1]).width;
- var firstRotated;
- var lastRotated;
+ if (this.options.stacked) {
+ return baseWidth;
+ }
+ return (baseWidth / datasetCount);
+ },
+ calculateBarX: function(datasetCount, datasetIndex, elementIndex) {
+ var xWidth = this.calculateBaseWidth(),
+ xAbsolute = this.getPixelForValue(null, elementIndex, true) - (xWidth / 2),
+ barWidth = this.calculateBarWidth(datasetCount);
- this.paddingRight = lastWidth / 2 + 3;
- this.paddingLeft = firstWidth / 2 + 3;
+ if (this.options.stacked) {
+ return xAbsolute + barWidth / 2;
+ }
- this.labelRotation = 0;
+ return xAbsolute + (barWidth * datasetIndex) + (datasetIndex * this.options.spacing) + barWidth / 2;
+ },
- if (this.options.display) {
- var originalLabelWidth = helpers.longestText(this.ctx, labelFont, this.labels);
- var cosRotation;
- var sinRotation;
- var firstRotatedWidth;
+ calculateLabelRotation: function(maxHeight, margins) {
+ //Get the width of each grid by calculating the difference
+ //between x offsets between 0 and 1.
+ var labelFont = helpers.fontString(this.options.labels.fontSize, this.options.labels.fontStyle, this.options.labels.fontFamily);
+ this.ctx.font = labelFont;
- this.labelWidth = originalLabelWidth;
+ var firstWidth = this.ctx.measureText(this.data.labels[0]).width;
+ var lastWidth = this.ctx.measureText(this.data.labels[this.data.labels.length - 1]).width;
+ var firstRotated;
+ var lastRotated;
- //Allow 3 pixels x2 padding either side for label readability
- // only the index matters for a dataset scale, but we want a consistent interface between scales
- var gridWidth = Math.floor(this.getPixelForValue(0, 1) - this.getPixelForValue(0, 0)) - 6;
+ this.paddingRight = lastWidth / 2 + 3;
+ this.paddingLeft = firstWidth / 2 + 3;
- //Max label rotate should be 90 - also act as a loop counter
- while ((this.labelWidth > gridWidth && this.labelRotation === 0) || (this.labelWidth > gridWidth && this.labelRotation <= 90 && this.labelRotation > 0)) {
- cosRotation = Math.cos(helpers.toRadians(this.labelRotation));
- sinRotation = Math.sin(helpers.toRadians(this.labelRotation));
+ this.labelRotation = 0;
- firstRotated = cosRotation * firstWidth;
- lastRotated = cosRotation * lastWidth;
+ if (this.options.display) {
+ var originalLabelWidth = helpers.longestText(this.ctx, labelFont, this.data.labels);
+ var cosRotation;
+ var sinRotation;
+ var firstRotatedWidth;
- // We're right aligning the text now.
- if (firstRotated + this.options.labels.fontSize / 2 > this.yLabelWidth) {
- this.paddingLeft = firstRotated + this.options.labels.fontSize / 2;
- }
+ this.labelWidth = originalLabelWidth;
- this.paddingRight = this.options.labels.fontSize / 2;
+ //Allow 3 pixels x2 padding either side for label readability
+ // only the index matters for a dataset scale, but we want a consistent interface between scales
+ var gridWidth = Math.floor(this.getPixelForValue(0, 1) - this.getPixelForValue(0, 0)) - 6;
- if (sinRotation * originalLabelWidth > maxHeight) {
- // go back one step
- this.labelRotation--;
- break;
- }
+ //Max label rotate should be 90 - also act as a loop counter
+ while ((this.labelWidth > gridWidth && this.labelRotation === 0) || (this.labelWidth > gridWidth && this.labelRotation <= 90 && this.labelRotation > 0)) {
+ cosRotation = Math.cos(helpers.toRadians(this.labelRotation));
+ sinRotation = Math.sin(helpers.toRadians(this.labelRotation));
- this.labelRotation++;
- this.labelWidth = cosRotation * originalLabelWidth;
+ firstRotated = cosRotation * firstWidth;
+ lastRotated = cosRotation * lastWidth;
- }
- } else {
- this.labelWidth = 0;
- this.paddingRight = 0;
- this.paddingLeft = 0;
- }
+ // We're right aligning the text now.
+ if (firstRotated + this.options.labels.fontSize / 2 > this.yLabelWidth) {
+ this.paddingLeft = firstRotated + this.options.labels.fontSize / 2;
+ }
- if (margins) {
- this.paddingLeft -= margins.left;
- this.paddingRight -= margins.right;
+ this.paddingRight = this.options.labels.fontSize / 2;
- this.paddingLeft = Math.max(this.paddingLeft, 0);
- this.paddingRight = Math.max(this.paddingRight, 0);
- }
+ if (sinRotation * originalLabelWidth > maxHeight) {
+ // go back one step
+ this.labelRotation--;
+ break;
+ }
- },
- // Fit this axis to the given size
- // @param {number} maxWidth : the max width the axis can be
- // @param {number} maxHeight: the max height the axis can be
- // @return {object} minSize : the minimum size needed to draw the axis
- fit: function(maxWidth, maxHeight, margins) {
- this.calculateRange();
- this.calculateLabelRotation(maxHeight, margins);
+ this.labelRotation++;
+ this.labelWidth = cosRotation * originalLabelWidth;
- var minSize = {
- width: 0,
- height: 0,
- };
+ }
+ } else {
+ this.labelWidth = 0;
+ this.paddingRight = 0;
+ this.paddingLeft = 0;
+ }
- var labelFont = helpers.fontString(this.options.labels.fontSize, this.options.labels.fontStyle, this.options.labels.fontFamily);
- var longestLabelWidth = helpers.longestText(this.ctx, labelFont, this.labels);
+ if (margins) {
+ this.paddingLeft -= margins.left;
+ this.paddingRight -= margins.right;
- // Width
- if (this.isHorizontal()) {
- minSize.width = maxWidth;
- this.width = maxWidth;
- } else if (this.options.display) {
- minSize.width = Math.min(longestLabelWidth + 6, maxWidth);
- }
+ this.paddingLeft = Math.max(this.paddingLeft, 0);
+ this.paddingRight = Math.max(this.paddingRight, 0);
+ }
- // Height
- if (this.isHorizontal()) {
- var labelHeight = (Math.cos(helpers.toRadians(this.labelRotation)) * longestLabelWidth) + 1.5 * this.options.labels.fontSize;
- minSize.height = Math.min(labelHeight, maxHeight);
- } else if (this.options.display) {
- minSize.width = Math.min(longestLabelWidth + 6, maxWidth);
- }
+ },
+ // Fit this axis to the given size
+ // @param {number} maxWidth : the max width the axis can be
+ // @param {number} maxHeight: the max height the axis can be
+ // @return {object} minSize : the minimum size needed to draw the axis
+ fit: function(maxWidth, maxHeight, margins) {
+ this.calculateLabelRotation(maxHeight, margins);
- this.width = minSize.width;
- this.height = minSize.height;
- return minSize;
- },
- // Actualy draw the scale on the canvas
- // @param {rectangle} chartArea : the area of the chart to draw full grid lines on
- draw: function(chartArea) {
- if (this.options.display) {
+ var minSize = {
+ width: 0,
+ height: 0,
+ };
- var setContextLineSettings;
+ var labelFont = helpers.fontString(this.options.labels.fontSize, this.options.labels.fontStyle, this.options.labels.fontFamily);
+ var longestLabelWidth = helpers.longestText(this.ctx, labelFont, this.data.labels);
- // Make sure we draw text in the correct color
- this.ctx.fillStyle = this.options.labels.fontColor;
+ // Width
+ if (this.isHorizontal()) {
+ minSize.width = maxWidth;
+ this.width = maxWidth;
+ } else if (this.options.display) {
+ minSize.width = Math.min(longestLabelWidth + 6, maxWidth);
+ }
- if (this.isHorizontal()) {
- setContextLineSettings = true;
- var yTickStart = this.options.position == "bottom" ? this.top : this.bottom - 10;
- var yTickEnd = this.options.position == "bottom" ? this.top + 10 : this.bottom;
- var isRotated = this.labelRotation !== 0;
+ // Height
+ if (this.isHorizontal()) {
+ var labelHeight = (Math.cos(helpers.toRadians(this.labelRotation)) * longestLabelWidth) + 1.5 * this.options.labels.fontSize;
+ minSize.height = Math.min(labelHeight, maxHeight);
+ } else if (this.options.display) {
+ minSize.width = Math.min(longestLabelWidth + 6, maxWidth);
+ }
- helpers.each(this.labels, function(label, index) {
- var xLineValue = this.getPixelForValue(label, index, false); // xvalues for grid lines
- var xLabelValue = this.getPixelForValue(label, index, true); // x values for labels (need to consider offsetLabel option)
+ this.width = minSize.width;
+ this.height = minSize.height;
+ return minSize;
+ },
+ // Actualy draw the scale on the canvas
+ // @param {rectangle} chartArea : the area of the chart to draw full grid lines on
+ draw: function(chartArea) {
+ if (this.options.display) {
- if (this.options.gridLines.show) {
- if (index === 0) {
- // Draw the first index specially
- this.ctx.lineWidth = this.options.gridLines.zeroLineWidth;
- this.ctx.strokeStyle = this.options.gridLines.zeroLineColor;
- setContextLineSettings = true; // reset next time
- } else if (setContextLineSettings) {
- this.ctx.lineWidth = this.options.gridLines.lineWidth;
- this.ctx.strokeStyle = this.options.gridLines.color;
- setContextLineSettings = false;
- }
+ var setContextLineSettings;
- xLineValue += helpers.aliasPixel(this.ctx.lineWidth);
+ // Make sure we draw text in the correct color
+ this.ctx.fillStyle = this.options.labels.fontColor;
- // Draw the label area
- this.ctx.beginPath();
+ if (this.isHorizontal()) {
+ setContextLineSettings = true;
+ var yTickStart = this.options.position == "bottom" ? this.top : this.bottom - 10;
+ var yTickEnd = this.options.position == "bottom" ? this.top + 10 : this.bottom;
+ var isRotated = this.labelRotation !== 0;
- if (this.options.gridLines.drawTicks) {
- this.ctx.moveTo(xLineValue, yTickStart);
- this.ctx.lineTo(xLineValue, yTickEnd);
- }
+ helpers.each(this.data.labels, function(label, index) {
+ var xLineValue = this.getPixelForValue(label, index, false); // xvalues for grid lines
+ var xLabelValue = this.getPixelForValue(label, index, true); // x values for labels (need to consider offsetLabel option)
- // Draw the chart area
- if (this.options.gridLines.drawOnChartArea) {
- this.ctx.moveTo(xLineValue, chartArea.top);
- this.ctx.lineTo(xLineValue, chartArea.bottom);
- }
+ if (this.options.gridLines.show) {
+ if (index === 0) {
+ // Draw the first index specially
+ this.ctx.lineWidth = this.options.gridLines.zeroLineWidth;
+ this.ctx.strokeStyle = this.options.gridLines.zeroLineColor;
+ setContextLineSettings = true; // reset next time
+ } else if (setContextLineSettings) {
+ this.ctx.lineWidth = this.options.gridLines.lineWidth;
+ this.ctx.strokeStyle = this.options.gridLines.color;
+ setContextLineSettings = false;
+ }
- // Need to stroke in the loop because we are potentially changing line widths & colours
- this.ctx.stroke();
- }
+ xLineValue += helpers.aliasPixel(this.ctx.lineWidth);
- if (this.options.labels.show) {
- this.ctx.save();
- this.ctx.translate(xLabelValue, (isRotated) ? this.top + 12 : this.top + 8);
- this.ctx.rotate(helpers.toRadians(this.labelRotation) * -1);
- this.ctx.font = this.font;
- this.ctx.textAlign = (isRotated) ? "right" : "center";
- this.ctx.textBaseline = (isRotated) ? "middle" : "top";
- this.ctx.fillText(label, 0, 0);
- this.ctx.restore();
- }
- }, this);
- } else {
- // Vertical
- if (this.options.gridLines.show) {}
+ // Draw the label area
+ this.ctx.beginPath();
- if (this.options.labels.show) {
- // Draw the labels
- }
- }
- }
- }
- });
- Chart.scales.registerScaleType("category", DatasetScale);
+ if (this.options.gridLines.drawTicks) {
+ this.ctx.moveTo(xLineValue, yTickStart);
+ this.ctx.lineTo(xLineValue, yTickEnd);
+ }
+
+ // Draw the chart area
+ if (this.options.gridLines.drawOnChartArea) {
+ this.ctx.moveTo(xLineValue, chartArea.top);
+ this.ctx.lineTo(xLineValue, chartArea.bottom);
+ }
+
+ // Need to stroke in the loop because we are potentially changing line widths & colours
+ this.ctx.stroke();
+ }
+
+ if (this.options.labels.show) {
+ this.ctx.save();
+ this.ctx.translate(xLabelValue, (isRotated) ? this.top + 12 : this.top + 8);
+ this.ctx.rotate(helpers.toRadians(this.labelRotation) * -1);
+ this.ctx.font = this.font;
+ this.ctx.textAlign = (isRotated) ? "right" : "center";
+ this.ctx.textBaseline = (isRotated) ? "middle" : "top";
+ this.ctx.fillText(label, 0, 0);
+ this.ctx.restore();
+ }
+ }, this);
+ } else {
+ // Vertical
+ if (this.options.gridLines.show) {}
+
+ if (this.options.labels.show) {
+ // Draw the labels
+ }
+ }
+ }
+ }
+ });
+ Chart.scales.registerScaleType("category", DatasetScale);