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

Merge pull request #1202 from etimberg/feature/v2.0-scale-refactor

Browse Source 
Push some of the scatter scale information down to the linear scale.
This commit is contained in:
Evert Timberg 2015-06-12 21:54:03 -04:00
commit 43efda72d4
3 changed files with 565 additions and 604 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1144
src/charts/chart.scatter.js
View File

File diff suppressed because it is too large Load Diff

4
src/scales/scale.category.js
View File

@ -27,7 +27,9 @@
return this.top + (index * (this.height / this.data.labels.length));
}
},
// For bar charts
// Functions needed for bar charts
calculateBaseWidth: function() {
return (this.getPixelForValue(null, 1, true) - this.getPixelForValue(null, 0, true)) - (2 * this.options.categorySpacing);
},

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

@ -113,6 +113,10 @@
this.labels.push(label ? label : ""); // empty string will not render so we're good
}, this);
},
// Get the correct value. If the value type is object get the x or y based on whether we are horizontal or not
getRightValue: function(rawValue) {
return typeof rawValue === "object" ? (this.isHorizontal() ? rawValue.x : rawValue.y) : rawValue;
},
getPixelForValue: function(value) {
// This must be called after fit has been run so that
// this.left, this.top, this.right, and this.bottom have been defined
@ -139,8 +143,11 @@
if (this.options.stacked) {
helpers.each(this.data.datasets, function(dataset) {
if (dataset.yAxisID === this.id) {
helpers.each(dataset.data, function(value, index) {
if (this.isHorizontal() ? dataset.xAxisID === this.id : dataset.yAxisID === this.id) {
helpers.each(dataset.data, function(rawValue, index) {
var value = this.getRightValue(rawValue);
positiveValues[index] = positiveValues[index] || 0;
negativeValues[index] = negativeValues[index] || 0;
@ -163,8 +170,10 @@
} else {
helpers.each(this.data.datasets, function(dataset) {
if (dataset.yAxisID === this.id) {
helpers.each(dataset.data, function(value, index) {
if (this.isHorizontal() ? dataset.xAxisID === this.id : dataset.yAxisID === this.id) {
helpers.each(dataset.data, function(rawValue, index) {
var value = this.getRightValue(rawValue);
if (this.min === null) {
this.min = value;
} else if (value < this.min) {
@ -182,7 +191,9 @@
}
},
getPointPixelForValue: function(value, index, datasetIndex) {
getPointPixelForValue: function(rawValue, index, datasetIndex) {
var value = this.getRightValue(rawValue);
if (this.options.stacked) {
var offsetPos = 0;
var offsetNeg = 0;