Mirrors/Chart.js
1
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2024-10-07 12:49:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed typo in core.helpers.js.

Browse Source 
Added ticks.fixedStepSize configuration parameter to force linear scale steps.
This commit is contained in:
Robert Becker 2016-02-04 15:20:17 +01:00
parent df218ead82
commit 9a20381af4
2 changed files with 197 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/core.helpers.js
View File

@ -843,7 +843,7 @@
},
isDatasetVisible = helpers.isDatasetVisible = function(dataset) {
return !dataset.hidden;
};
},
pushAllIfDefined = helpers.pushAllIfDefined = function(element, array) {
if (typeof element == "undefined") {
return;

30
src/scales/scale.linear.js
View File

@ -1,4 +1,4 @@
(function() {
(function () {
"use strict";
var root = this,
@ -8,7 +8,7 @@
var defaultConfig = {
position: "left",
ticks: {
callback: function(tickValue, index, ticks) {
callback: function (tickValue, index, ticks) {
var delta = ticks[1] - ticks[0];
// If we have a number like 2.5 as the delta, figure out how many decimal places we need
@ -36,7 +36,7 @@
};
var LinearScale = Chart.Scale.extend({
buildTicks: function() {
buildTicks: function () {
// First Calculate the range
this.min = null;
@ -45,7 +45,7 @@
if (this.options.stacked) {
var valuesPerType = {};
helpers.each(this.chart.data.datasets, function(dataset) {
helpers.each(this.chart.data.datasets, function (dataset) {
if (valuesPerType[dataset.type] === undefined) {
valuesPerType[dataset.type] = {
positiveValues: [],
@ -58,7 +58,7 @@
var negativeValues = valuesPerType[dataset.type].negativeValues;
if (helpers.isDatasetVisible(dataset) && (this.isHorizontal() ? dataset.xAxisID === this.id : dataset.yAxisID === this.id)) {
helpers.each(dataset.data, function(rawValue, index) {
helpers.each(dataset.data, function (rawValue, index) {
var value = +this.getRightValue(rawValue);
if (isNaN(value)) {
@ -81,7 +81,7 @@
}
}, this);
helpers.each(valuesPerType, function(valuesForType) {
helpers.each(valuesPerType, function (valuesForType) {
var values = valuesForType.positiveValues.concat(valuesForType.negativeValues);
var minVal = helpers.min(values);
var maxVal = helpers.max(values);
@ -90,9 +90,9 @@
}, this);
} else {
helpers.each(this.chart.data.datasets, function(dataset) {
helpers.each(this.chart.data.datasets, function (dataset) {
if (helpers.isDatasetVisible(dataset) && (this.isHorizontal() ? dataset.xAxisID === this.id : dataset.yAxisID === this.id)) {
helpers.each(dataset.data, function(rawValue, index) {
helpers.each(dataset.data, function (rawValue, index) {
var value = +this.getRightValue(rawValue);
if (isNaN(value)) {
return;
@ -156,6 +156,7 @@
}
}
if (this.options.ticks.suggestedMin) {
this.min = Math.min(this.min, this.options.ticks.suggestedMin);
}
@ -169,6 +170,12 @@
this.max++;
}
if (this.options.ticks.fixedStepSize) {
for (var j = this.min; j <= this.max; ++j) {
console.log(j * this.options.ticks.fixedStepSize);
this.ticks.push(j * this.options.ticks.fixedStepSize);
}
} else {
var niceRange = helpers.niceNum(this.max - this.min, false);
var spacing = helpers.niceNum(niceRange / (maxTicks - 1), true);
var niceMin = Math.floor(this.min / spacing) * spacing;
@ -180,6 +187,7 @@
for (var j = 0; j <= numSpaces; ++j) {
this.ticks.push(niceMin + (j * spacing));
}
}
if (this.options.position == "left" || this.options.position == "right") {
// We are in a vertical orientation. The top value is the highest. So reverse the array
@ -203,13 +211,11 @@
this.zeroLineIndex = this.ticks.indexOf(0);
},
getLabelForIndex: function(index, datasetIndex) {
getLabelForIndex: function (index, datasetIndex) {
return +this.getRightValue(this.chart.data.datasets[datasetIndex].data[index]);
},
// Utils
getPixelForValue: function(value, index, datasetIndex, includeOffset) {
getPixelForValue: function (value, index, datasetIndex, includeOffset) {
// This must be called after fit has been run so that
// this.left, this.top, this.right, and this.bottom have been defined
var rightValue = +this.getRightValue(value);