Mirrors/Chart.js
2
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2026-03-13 19:56:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix an error in the scale service that prevented the chart from filling the canvas fully.

Browse Source
This commit is contained in:
Evert Timberg
2015-05-18 10:27:39 -04:00
parent a6e2eec9e0
commit f2065265c8
1 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/Chart.Scale.js
View File

@@ -148,16 +148,24 @@
var horizontalScaleHeight = (height - chartHeight) / (topScales.length + bottomScales.length);
// Step 4;
var scalesToMinSize = {};
var minimumScaleSizes = [];
var verticalScaleMinSizeFunction = function(scaleInstance) {
var minSize = scaleInstance.fit(verticalScaleWidth, chartHeight);
scalesToMinSize[scaleInstance] = minSize;
minimumScaleSizes.push({
horizontal: false,
minSize: minSize,
scale: scaleInstance,
});
};
var horizontalScaleMinSizeFunction = function(scaleInstance) {
var minSize = scaleInstance.fit(chartWidth, horizontalScaleHeight);
scalesToMinSize[scaleInstance] = minSize;
minimumScaleSizes.push({
horizontal: true,
minSize: minSize,
scale: scaleInstance,
});
};
// vertical scales
@@ -172,18 +180,13 @@
var maxChartHeight = height - (2 * yPadding);
var maxChartWidth = width - (2 * xPadding);
var chartWidthReduceFunction = function(scaleInstance) {
maxChartWidth -= scalesToMinSize[scaleInstance].width;
};
var chartHeightReduceFunction = function(scaleInstance) {
maxChartHeight -= scalesToMinSize[scaleInstance].height;
};
helpers.each(leftScales, chartWidthReduceFunction);
helpers.each(rightScales, chartWidthReduceFunction);
helpers.each(topScales, chartHeightReduceFunction);
helpers.each(bottomScales, chartHeightReduceFunction);
helpers.each(minimumScaleSizes, function(wrapper) {
if (wrapper.horizontal) {
maxChartHeight -= wrapper.minSize.height;
} else {
maxChartWidth -= wrapper.minSize.width;
}
});
// At this point, maxChartHeight and maxChartWidth are the size the chart area could
// be if the axes are drawn at their minimum sizes.
@@ -204,13 +207,23 @@
// Step 6
var verticalScaleFitFunction = function(scaleInstance) {
var minSize = scalesToMinSize[scaleInstance];
scaleInstance.fit(minSize.width, maxChartHeight);
var wrapper = helpers.findNextWhere(minimumScaleSizes, function(wrapper) {
return wrapper.scale === scaleInstance;
});
if (wrapper) {
scaleInstance.fit(wrapper.minSize.width, maxChartHeight);
}
};
var horizontalScaleFitFunction = function(scaleInstance) {
var minSize = scalesToMinSize[scaleInstance];
scaleInstance.fit(maxChartWidth, minSize.width);
var wrapper = helpers.findNextWhere(minimumScaleSizes, function(wrapper) {
return wrapper.scale === scaleInstance;
});
if (wrapper) {
scaleInstance.fit(maxChartWidth, wrapper.minSize.width);
}
};
helpers.each(leftScales, verticalScaleFitFunction);