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

Support arrays of colors and line widths in cartesian axes

Browse Source
This commit is contained in:
Evert Timberg 2016-06-07 20:22:06 -04:00
parent a687749ed4
commit 6b2cfd5e11
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
samples/line-logarithmic.html
View File

@ -59,6 +59,9 @@
scales: {
xAxes: [{
display: true,
gridLines: {
color: ['black', 'red', 'orange', 'yellow', 'green', 'blue', 'indigo', 'violet']
},
scaleLabel: {
display: true,
labelString: 'x axis'

23
src/core/core.scale.js
View File

@ -488,7 +488,6 @@ module.exports = function(Chart) {
var gridLines = options.gridLines;
var scaleLabel = options.scaleLabel;
var setContextLineSettings;
var isRotated = me.labelRotation !== 0;
var skipRatio;
var scaleLabelX;
@ -524,7 +523,6 @@ module.exports = function(Chart) {
context.fillStyle = tickFontColor;
if (me.isHorizontal()) {
setContextLineSettings = true;
var yTickStart = options.position === "bottom" ? me.top : me.bottom - tl;
var yTickEnd = options.position === "bottom" ? me.top + tl : me.bottom;
skipRatio = false;
@ -571,11 +569,9 @@ module.exports = function(Chart) {
// Draw the first index specially
context.lineWidth = gridLines.zeroLineWidth;
context.strokeStyle = gridLines.zeroLineColor;
setContextLineSettings = true; // reset next time
} else if (setContextLineSettings) {
context.lineWidth = gridLines.lineWidth;
context.strokeStyle = gridLines.color;
setContextLineSettings = false;
} else {
context.lineWidth = helpers.getValueAtIndexOrDefault(gridLines.lineWidth, index);
context.strokeStyle = helpers.getValueAtIndexOrDefault(gridLines.color, index);
}
xLineValue += helpers.aliasPixel(context.lineWidth);
@ -635,7 +631,6 @@ module.exports = function(Chart) {
}
} else {
setContextLineSettings = true;
var xTickStart = options.position === "right" ? me.left : me.right - 5;
var xTickEnd = options.position === "right" ? me.left + 5 : me.right;
@ -652,11 +647,9 @@ module.exports = function(Chart) {
// Draw the first index specially
context.lineWidth = gridLines.zeroLineWidth;
context.strokeStyle = gridLines.zeroLineColor;
setContextLineSettings = true; // reset next time
} else if (setContextLineSettings) {
context.lineWidth = gridLines.lineWidth;
context.strokeStyle = gridLines.color;
setContextLineSettings = false;
} else {
context.lineWidth = helpers.getValueAtIndexOrDefault(gridLines.lineWidth, index);
context.strokeStyle = helpers.getValueAtIndexOrDefault(gridLines.color, index);
}
yLineValue += helpers.aliasPixel(context.lineWidth);
@ -733,8 +726,8 @@ module.exports = function(Chart) {
if (gridLines.drawBorder) {
// Draw the line at the edge of the axis
context.lineWidth = gridLines.lineWidth;
context.strokeStyle = gridLines.color;
context.lineWidth = helpers.getValueAtIndexOrDefault(gridLines.lineWidth, 0);
context.strokeStyle = helpers.getValueAtIndexOrDefault(gridLines.color, 0);
var x1 = me.left,
x2 = me.right,
y1 = me.top,