]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
Move more data into the linear scale.This simplifies `buildScale` for line and bar...
authorEvert Timberg <evert.timberg@gmail.com>
Sat, 13 Jun 2015 01:15:15 +0000 (21:15 -0400)
committerEvert Timberg <evert.timberg@gmail.com>
Sat, 13 Jun 2015 01:15:15 +0000 (21:15 -0400)
samples/bar-stacked.html
src/charts/chart.bar.js
src/charts/chart.line.js
src/scales/scale.linear.js

index da9e4fb5c471e663191d06c43f599ac9dcc65fac..1d7257f3de7aa6c2718707cd8b4f680ab88c0618 100644 (file)
             data: barChartData,
             options: {
                 responsive: true,
-                stacked: true,
+                scales: {
+                    yAxes: [{
+                        stacked: true
+                    }]
+                }
             }
         });
     };
index 23af96b2a1a34c3cccbd6b62c904dfa052f512f5..aa7f06a88fac136390fad0ff2eaf9a1a7ede7290 100644 (file)
         buildScale: function(labels) {
             var self = this;
 
-            // Function to determine the range of all the 
-            var calculateYRange = function() {
-                this.min = null;
-                this.max = null;
-
-                var positiveValues = [];
-                var negativeValues = [];
-
-                if (self.options.stacked) {
-                    helpers.each(self.data.datasets, function(dataset) {
-                        if (dataset.yAxisID === this.id) {
-                            helpers.each(dataset.data, function(value, index) {
-                                positiveValues[index] = positiveValues[index] || 0;
-                                negativeValues[index] = negativeValues[index] || 0;
-
-                                if (self.options.relativePoints) {
-                                    positiveValues[index] = 100;
-                                } else {
-                                    if (value < 0) {
-                                        negativeValues[index] += value;
-                                    } else {
-                                        positiveValues[index] += value;
-                                    }
-                                }
-                            }, this);
-                        }
-                    }, this);
-
-                    var values = positiveValues.concat(negativeValues);
-                    this.min = helpers.min(values);
-                    this.max = helpers.max(values);
-
-                } else {
-                    helpers.each(self.data.datasets, function(dataset) {
-                        if (dataset.yAxisID === this.id) {
-                            helpers.each(dataset.data, function(value, index) {
-                                if (this.min === null) {
-                                    this.min = value;
-                                } else if (value < this.min) {
-                                    this.min = value;
-                                }
-
-                                if (this.max === null) {
-                                    this.max = value;
-                                } else if (value > this.max) {
-                                    this.max = value;
-                                }
-                            }, this);
-                        }
-                    }, this);
-                }
-            };
-
             // Map of scale ID to scale object so we can lookup later 
             this.scales = {};
 
                 var scale = new ScaleClass({
                     ctx: this.chart.ctx,
                     options: yAxisOptions,
-                    calculateRange: calculateYRange,
-                    calculateBarBase: function(datasetIndex, index) {
-                        var base = 0;
-
-                        if (self.options.stacked) {
-
-                            var value = self.data.datasets[datasetIndex].data[index];
-
-                            if (value < 0) {
-                                for (var i = 0; i < datasetIndex; i++) {
-                                    if (self.data.datasets[i].yAxisID === this.id) {
-                                        base += self.data.datasets[i].data[index] < 0 ? self.data.datasets[i].data[index] : 0;
-                                    }
-                                }
-                            } else {
-                                for (var j = 0; j < datasetIndex; j++) {
-                                    if (self.data.datasets[j].yAxisID === this.id) {
-                                        base += self.data.datasets[j].data[index] > 0 ? self.data.datasets[j].data[index] : 0;
-                                    }
-                                }
-                            }
-
-                            return this.getPixelForValue(base);
-                        }
-
-                        base = this.getPixelForValue(this.min);
-
-                        if (this.beginAtZero || ((this.min <= 0 && this.max >= 0) || (this.min >= 0 && this.max <= 0))) {
-                            base = this.getPixelForValue(0);
-                            base += this.options.gridLines.lineWidth;
-                        } else if (this.min < 0 && this.max < 0) {
-                            // All values are negative. Use the top as the base
-                            base = this.getPixelForValue(this.max);
-                        }
-
-                        return base;
-
-                    },
-                    calculateBarY: function(datasetIndex, index) {
-
-                        var value = self.data.datasets[datasetIndex].data[index];
-
-                        if (self.options.stacked) {
-
-                            var sumPos = 0,
-                                sumNeg = 0;
-
-                            for (var i = 0; i < datasetIndex; i++) {
-                                if (self.data.datasets[i].data[index] < 0) {
-                                    sumNeg += self.data.datasets[i].data[index] || 0;
-                                } else {
-                                    sumPos += self.data.datasets[i].data[index] || 0;
-                                }
-                            }
-
-                            if (value < 0) {
-                                return this.getPixelForValue(sumNeg + value);
-                            } else {
-                                return this.getPixelForValue(sumPos + value);
-                            }
-
-                            return this.getPixelForValue(value);
-                        }
-
-                        var offset = 0;
-
-                        for (var j = datasetIndex; j < self.data.datasets.length; j++) {
-                            if (j === datasetIndex && value) {
-                                offset += value;
-                            } else {
-                                offset = offset + value;
-                            }
-                        }
-
-                        return this.getPixelForValue(value);
-                    },
+                    data: this.data,
                     id: yAxisOptions.id,
                 });
 
index b49789ead2010dd94dd8ca2156f303007fcafd6c..60163ce08a8f48a4b842772ff79acc55eb6cda7e 100644 (file)
         buildScale: function() {
             var self = this;
 
-            // Function to determine the range of all the 
-            var calculateYRange = function() {
-                this.min = null;
-                this.max = null;
-
-                var positiveValues = [];
-                var negativeValues = [];
-
-                if (self.options.stacked) {
-                    helpers.each(self.data.datasets, function(dataset) {
-                        if (dataset.yAxisID === this.id) {
-                            helpers.each(dataset.data, function(value, index) {
-                                positiveValues[index] = positiveValues[index] || 0;
-                                negativeValues[index] = negativeValues[index] || 0;
-
-                                if (self.options.relativePoints) {
-                                    positiveValues[index] = 100;
-                                } else {
-                                    if (value < 0) {
-                                        negativeValues[index] += value;
-                                    } else {
-                                        positiveValues[index] += value;
-                                    }
-                                }
-                            }, this);
-                        }
-                    }, this);
-
-                    var values = positiveValues.concat(negativeValues);
-                    this.min = helpers.min(values);
-                    this.max = helpers.max(values);
-                } else {
-                    helpers.each(self.data.datasets, function(dataset) {
-                        if (dataset.yAxisID === this.id) {
-                            helpers.each(dataset.data, function(value, index) {
-                                if (this.min === null) {
-                                    this.min = value;
-                                } else if (value < this.min) {
-                                    this.min = value;
-                                }
-
-                                if (this.max === null) {
-                                    this.max = value;
-                                } else if (value > this.max) {
-                                    this.max = value;
-                                }
-                            }, this);
-                        }
-                    }, this);
-                }
-            };
-
             // Map of scale ID to scale object so we can lookup later 
             this.scales = {};
 
                 var scale = new ScaleClass({
                     ctx: this.chart.ctx,
                     options: yAxisOptions,
-                    calculateRange: calculateYRange,
-                    getPointPixelForValue: function(value, index, datasetIndex) {
-                        if (self.options.stacked) {
-                            var offsetPos = 0;
-                            var offsetNeg = 0;
-
-                            for (var i = 0; i < datasetIndex; ++i) {
-                                if (self.data.datasets[i].data[index] < 0) {
-                                    offsetNeg += self.data.datasets[i].data[index];
-                                } else {
-                                    offsetPos += self.data.datasets[i].data[index];
-                                }
-                            }
-
-                            if (value < 0) {
-                                return this.getPixelForValue(offsetNeg + value);
-                            } else {
-                                return this.getPixelForValue(offsetPos + value);
-                            }
-                        } else {
-                            return this.getPixelForValue(value);
-                        }
-                    },
+                    data: this.data,
                     id: yAxisOptions.id,
                 });
 
index 021cd86608718623f20f52b73a666a8b2daac059..b5da78e2bbeca69531f3636f13655f04470b678a 100644 (file)
 (function() {
-    "use strict";
-
-    var root = this,
-        Chart = root.Chart,
-        helpers = Chart.helpers;
-
-    var LinearScale = Chart.Element.extend({
-        calculateRange: helpers.noop, // overridden in the chart. Will set min and max as properties of the scale for later use
-        isHorizontal: function() {
-            return this.options.position == "top" || this.options.position == "bottom";
-        },
-        generateTicks: function(width, height) {
-            // We need to decide how many ticks we are going to have. Each tick draws a grid line.
-            // There are two possibilities. The first is that the user has manually overridden the scale
-            // calculations in which case the job is easy. The other case is that we have to do it ourselves
-            // 
-            // We assume at this point that the scale object has been updated with the following values
-            // by the chart.
-            //  min: this is the minimum value of the scale
-            //  max: this is the maximum value of the scale
-            //  options: contains the options for the scale. This is referenced from the user settings
-            //      rather than being cloned. This ensures that updates always propogate to a redraw
-
-            // Reset the ticks array. Later on, we will draw a grid line at these positions
-            // The array simply contains the numerical value of the spots where ticks will be
-            this.ticks = [];
-
-            if (this.options.override) {
-                // The user has specified the manual override. We use <= instead of < so that 
-                // we get the final line
-                for (var i = 0; i <= this.options.override.steps; ++i) {
-                    var value = this.options.override.start + (i * this.options.override.stepWidth);
-                    ticks.push(value);
-                }
-            } else {
-                // Figure out what the max number of ticks we can support it is based on the size of
-                // the axis area. For now, we say that the minimum tick spacing in pixels must be 50
-                // We also limit the maximum number of ticks to 11 which gives a nice 10 squares on 
-                // the graph
-
-                var maxTicks;
-
-                if (this.isHorizontal()) {
-                    maxTicks = Math.min(11, Math.ceil(width / 50));
-                } else {
-                    // The factor of 2 used to scale the font size has been experimentally determined.
-                    maxTicks = Math.min(11, Math.ceil(height / (2 * this.options.labels.fontSize)));
-                }
-
-                // Make sure we always have at least 2 ticks 
-                maxTicks = Math.max(2, maxTicks);
-
-                // To get a "nice" value for the tick spacing, we will use the appropriately named 
-                // "nice number" algorithm. See http://stackoverflow.com/questions/8506881/nice-label-algorithm-for-charts-with-minimum-ticks
-                // for details.
-
-                // If we are forcing it to begin at 0, but 0 will already be rendered on the chart,
-                // do nothing since that would make the chart weird. If the user really wants a weird chart
-                // axis, they can manually override it
-                if (this.options.beginAtZero) {
-                    var minSign = helpers.sign(this.min);
-                    var maxSign = helpers.sign(this.max);
-
-                    if (minSign < 0 && maxSign < 0) {
-                        // move the top up to 0
-                        this.max = 0;
-                    } else if (minSign > 0 && maxSign > 0) {
-                        // move the botttom down to 0
-                        this.min = 0;
-                    }
-                }
-
-                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;
-                var niceMax = Math.ceil(this.max / spacing) * spacing;
-
-                // Put the values into the ticks array
-                for (var j = niceMin; j <= niceMax; j += spacing) {
-                    this.ticks.push(j);
-                }
-            }
-
-            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
-                this.ticks.reverse();
-            }
-
-            // At this point, we need to update our max and min given the tick values since we have expanded the
-            // range of the scale
-            this.max = helpers.max(this.ticks);
-            this.min = helpers.min(this.ticks);
-        },
-        buildLabels: function() {
-            // We assume that this has been run after ticks have been generated. We try to figure out
-            // a label for each tick. 
-            this.labels = [];
-
-            helpers.each(this.ticks, function(tick, index, ticks) {
-                var label;
-
-                if (this.options.labels.userCallback) {
-                    // If the user provided a callback for label generation, use that as first priority
-                    label = this.options.lables.userCallback(tick, index, ticks);
-                } else if (this.options.labels.template) {
-                    // else fall back to the template string
-                    label = helpers.template(this.options.labels.template, {
-                        value: tick
-                    });
-                }
-
-                this.labels.push(label ? label : ""); // empty string will not render so we're good
-            }, this);
-        },
-        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
-            var pixel;
-            var range = this.max - this.min;
-
-            if (this.isHorizontal()) {
-                pixel = this.left + (this.width / range * (value - this.min));
-            } else {
-                // Bottom - top since pixels increase downard on a screen
-                pixel = this.bottom - (this.height / range * (value - this.min));
-            }
-
-            return pixel;
-        },
-        // 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) {
-            this.calculateRange();
-            this.generateTicks(maxWidth, maxHeight);
-            this.buildLabels();
-
-            var minSize = {
-                width: 0,
-                height: 0,
-            };
-
-            // In a horizontal axis, we need some room for the scale to be drawn
-            //
-            //      -----------------------------------------------------
-            //          |           |           |           |           |
-            //
-            // In a vertical axis, we need some room for the scale to be drawn.
-            // The actual grid lines will be drawn on the chart area, however, we need to show 
-            // ticks where the axis actually is.
-            // We will allocate 25px for this width
-            //      |
-            //     -|
-            //      |
-            //      |
-            //     -|
-            //      |
-            //      |
-            //     -|
-
-
-            // Width
-            if (this.isHorizontal()) {
-                minSize.width = maxWidth; // fill all the width
-            } else {
-                minSize.width = this.options.gridLines.show && this.options.display ? 10 : 0;
-            }
-
-            // height
-            if (this.isHorizontal()) {
-                minSize.height = this.options.gridLines.show && this.options.display ? 10 : 0;
-            } else {
-                minSize.height = maxHeight; // fill all the height
-            }
-
-
-
-            if (this.options.labels.show && this.options.display) {
-                // Don't bother fitting the labels if we are not showing them
-                var labelFont = helpers.fontString(this.options.labels.fontSize,
-                    this.options.labels.fontStyle, this.options.labels.fontFamily);
-
-                if (this.isHorizontal()) {
-                    // A horizontal axis is more constrained by the height.
-                    var maxLabelHeight = maxHeight - minSize.height;
-                    var labelHeight = 1.5 * this.options.labels.fontSize;
-                    minSize.height = Math.min(maxHeight, minSize.height + labelHeight);
-                } else {
-                    // A vertical axis is more constrained by the width. Labels are the dominant factor 
-                    // here, so get that length first
-                    var maxLabelWidth = maxWidth - minSize.width;
-                    var largestTextWidth = helpers.longestText(this.ctx, labelFont, this.labels);
-
-                    if (largestTextWidth < maxLabelWidth) {
-                        // We don't need all the room
-                        minSize.width += largestTextWidth;
-                    } else {
-                        // Expand to max size
-                        minSize.width = maxWidth;
-                    }
-                }
-            }
-
-            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 setContextLineSettings;
-                var hasZero;
-
-                // Make sure we draw text in the correct color
-                this.ctx.fillStyle = this.options.labels.fontColor;
-
-                if (this.isHorizontal()) {
-                    if (this.options.gridLines.show) {
-                        // Draw the horizontal line
-                        setContextLineSettings = true;
-                        hasZero = helpers.findNextWhere(this.ticks, function(tick) {
-                            return tick === 0;
-                        }) !== undefined;
-                        var yTickStart = this.options.position == "bottom" ? this.top : this.bottom - 5;
-                        var yTickEnd = this.options.position == "bottom" ? this.top + 5 : this.bottom;
-
-                        helpers.each(this.ticks, function(tick, index) {
-                            // Grid lines are vertical
-                            var xValue = this.getPixelForValue(tick);
-
-                            if (tick === 0 || (!hasZero && index === 0)) {
-                                // Draw the 0 point specially or the left if there is no 0
-                                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;
-                            }
-
-                            xValue += helpers.aliasPixel(this.ctx.lineWidth);
-
-                            // Draw the label area
-                            this.ctx.beginPath();
-
-                            if (this.options.gridLines.drawTicks) {
-                                this.ctx.moveTo(xValue, yTickStart);
-                                this.ctx.lineTo(xValue, yTickEnd);
-                            }
-
-                            // Draw the chart area
-                            if (this.options.gridLines.drawOnChartArea) {
-                                this.ctx.moveTo(xValue, chartArea.top);
-                                this.ctx.lineTo(xValue, chartArea.bottom);
-                            }
-
-                            // Need to stroke in the loop because we are potentially changing line widths & colours
-                            this.ctx.stroke();
-                        }, this);
-                    }
-
-                    if (this.options.labels.show) {
-                        // Draw the labels
-
-                        var labelStartY;
-
-                        if (this.options.position == "top") {
-                            labelStartY = this.bottom - 10;
-                            this.ctx.textBaseline = "bottom";
-                        } else {
-                            // bottom side
-                            labelStartY = this.top + 10;
-                            this.ctx.textBaseline = "top";
-                        }
-
-                        this.ctx.textAlign = "center";
-                        this.ctx.font = helpers.fontString(this.options.labels.fontSize, this.options.labels.fontStyle, this.options.labels.fontFamily);
-
-                        helpers.each(this.labels, function(label, index) {
-                            var xValue = this.getPixelForValue(this.ticks[index]);
-                            this.ctx.fillText(label, xValue, labelStartY);
-                        }, this);
-                    }
-                } else {
-                    // Vertical
-                    if (this.options.gridLines.show) {
-
-                        // Draw the vertical line
-                        setContextLineSettings = true;
-                        hasZero = helpers.findNextWhere(this.ticks, function(tick) {
-                            return tick === 0;
-                        }) !== undefined;
-                        var xTickStart = this.options.position == "right" ? this.left : this.right - 5;
-                        var xTickEnd = this.options.position == "right" ? this.left + 5 : this.right;
-
-                        helpers.each(this.ticks, function(tick, index) {
-                            // Grid lines are horizontal
-                            var yValue = this.getPixelForValue(tick);
-
-                            if (tick === 0 || (!hasZero && index === 0)) {
-                                // Draw the 0 point specially or the bottom if there is no 0
-                                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; // use boolean to indicate that we only want to do this once
-                            }
-
-                            yValue += helpers.aliasPixel(this.ctx.lineWidth);
-
-                            // Draw the label area
-                            this.ctx.beginPath();
-
-                            if (this.options.gridLines.drawTicks) {
-                                this.ctx.moveTo(xTickStart, yValue);
-                                this.ctx.lineTo(xTickEnd, yValue);
-                            }
-
-                            // Draw the chart area
-                            if (this.options.gridLines.drawOnChartArea) {
-                                this.ctx.moveTo(chartArea.left, yValue);
-                                this.ctx.lineTo(chartArea.right, yValue);
-                            }
-
-                            this.ctx.stroke();
-                        }, this);
-                    }
-
-                    if (this.options.labels.show) {
-                        // Draw the labels
-
-                        var labelStartX;
-
-                        if (this.options.position == "left") {
-                            labelStartX = this.right - 10;
-                            this.ctx.textAlign = "right";
-                        } else {
-                            // right side
-                            labelStartX = this.left + 5;
-                            this.ctx.textAlign = "left";
-                        }
-
-                        this.ctx.textBaseline = "middle";
-                        this.ctx.font = helpers.fontString(this.options.labels.fontSize, this.options.labels.fontStyle, this.options.labels.fontFamily);
-
-                        helpers.each(this.labels, function(label, index) {
-                            var yValue = this.getPixelForValue(this.ticks[index]);
-                            this.ctx.fillText(label, labelStartX, yValue);
-                        }, this);
-                    }
-                }
-            }
-        }
-    });
-    Chart.scales.registerScaleType("linear", LinearScale);
+       "use strict";
+
+       var root = this,
+               Chart = root.Chart,
+               helpers = Chart.helpers;
+
+       var LinearScale = Chart.Element.extend({
+               calculateRange: helpers.noop, // overridden in the chart. Will set min and max as properties of the scale for later use
+               isHorizontal: function() {
+                       return this.options.position == "top" || this.options.position == "bottom";
+               },
+               generateTicks: function(width, height) {
+                       // We need to decide how many ticks we are going to have. Each tick draws a grid line.
+                       // There are two possibilities. The first is that the user has manually overridden the scale
+                       // calculations in which case the job is easy. The other case is that we have to do it ourselves
+                       // 
+                       // We assume at this point that the scale object has been updated with the following values
+                       // by the chart.
+                       //  min: this is the minimum value of the scale
+                       //  max: this is the maximum value of the scale
+                       //  options: contains the options for the scale. This is referenced from the user settings
+                       //      rather than being cloned. This ensures that updates always propogate to a redraw
+
+                       // Reset the ticks array. Later on, we will draw a grid line at these positions
+                       // The array simply contains the numerical value of the spots where ticks will be
+                       this.ticks = [];
+
+                       if (this.options.override) {
+                               // The user has specified the manual override. We use <= instead of < so that 
+                               // we get the final line
+                               for (var i = 0; i <= this.options.override.steps; ++i) {
+                                       var value = this.options.override.start + (i * this.options.override.stepWidth);
+                                       ticks.push(value);
+                               }
+                       } else {
+                               // Figure out what the max number of ticks we can support it is based on the size of
+                               // the axis area. For now, we say that the minimum tick spacing in pixels must be 50
+                               // We also limit the maximum number of ticks to 11 which gives a nice 10 squares on 
+                               // the graph
+
+                               var maxTicks;
+
+                               if (this.isHorizontal()) {
+                                       maxTicks = Math.min(11, Math.ceil(width / 50));
+                               } else {
+                                       // The factor of 2 used to scale the font size has been experimentally determined.
+                                       maxTicks = Math.min(11, Math.ceil(height / (2 * this.options.labels.fontSize)));
+                               }
+
+                               // Make sure we always have at least 2 ticks 
+                               maxTicks = Math.max(2, maxTicks);
+
+                               // To get a "nice" value for the tick spacing, we will use the appropriately named 
+                               // "nice number" algorithm. See http://stackoverflow.com/questions/8506881/nice-label-algorithm-for-charts-with-minimum-ticks
+                               // for details.
+
+                               // If we are forcing it to begin at 0, but 0 will already be rendered on the chart,
+                               // do nothing since that would make the chart weird. If the user really wants a weird chart
+                               // axis, they can manually override it
+                               if (this.options.beginAtZero) {
+                                       var minSign = helpers.sign(this.min);
+                                       var maxSign = helpers.sign(this.max);
+
+                                       if (minSign < 0 && maxSign < 0) {
+                                               // move the top up to 0
+                                               this.max = 0;
+                                       } else if (minSign > 0 && maxSign > 0) {
+                                               // move the botttom down to 0
+                                               this.min = 0;
+                                       }
+                               }
+
+                               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;
+                               var niceMax = Math.ceil(this.max / spacing) * spacing;
+
+                               // Put the values into the ticks array
+                               for (var j = niceMin; j <= niceMax; j += spacing) {
+                                       this.ticks.push(j);
+                               }
+                       }
+
+                       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
+                               this.ticks.reverse();
+                       }
+
+                       // At this point, we need to update our max and min given the tick values since we have expanded the
+                       // range of the scale
+                       this.max = helpers.max(this.ticks);
+                       this.min = helpers.min(this.ticks);
+               },
+               buildLabels: function() {
+                       // We assume that this has been run after ticks have been generated. We try to figure out
+                       // a label for each tick. 
+                       this.labels = [];
+
+                       helpers.each(this.ticks, function(tick, index, ticks) {
+                               var label;
+
+                               if (this.options.labels.userCallback) {
+                                       // If the user provided a callback for label generation, use that as first priority
+                                       label = this.options.lables.userCallback(tick, index, ticks);
+                               } else if (this.options.labels.template) {
+                                       // else fall back to the template string
+                                       label = helpers.template(this.options.labels.template, {
+                                               value: tick
+                                       });
+                               }
+
+                               this.labels.push(label ? label : ""); // empty string will not render so we're good
+                       }, this);
+               },
+               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
+                       var pixel;
+                       var range = this.max - this.min;
+
+                       if (this.isHorizontal()) {
+                               pixel = this.left + (this.width / range * (value - this.min));
+                       } else {
+                               // Bottom - top since pixels increase downard on a screen
+                               pixel = this.bottom - (this.height / range * (value - this.min));
+                       }
+
+                       return pixel;
+               },
+
+               // Functions needed for line charts
+               calculateRange: function() {
+                       this.min = null;
+                       this.max = null;
+
+                       var positiveValues = [];
+                       var negativeValues = [];
+
+                       if (this.options.stacked) {
+                               helpers.each(this.data.datasets, function(dataset) {
+                                       if (dataset.yAxisID === this.id) {
+                                               helpers.each(dataset.data, function(value, index) {
+                                                       positiveValues[index] = positiveValues[index] || 0;
+                                                       negativeValues[index] = negativeValues[index] || 0;
+
+                                                       if (this.options.relativePoints) {
+                                                               positiveValues[index] = 100;
+                                                       } else {
+                                                               if (value < 0) {
+                                                                       negativeValues[index] += value;
+                                                               } else {
+                                                                       positiveValues[index] += value;
+                                                               }
+                                                       }
+                                               }, this);
+                                       }
+                               }, this);
+
+                               var values = positiveValues.concat(negativeValues);
+                               this.min = helpers.min(values);
+                               this.max = helpers.max(values);
+
+                       } else {
+                               helpers.each(this.data.datasets, function(dataset) {
+                                       if (dataset.yAxisID === this.id) {
+                                               helpers.each(dataset.data, function(value, index) {
+                                                       if (this.min === null) {
+                                                               this.min = value;
+                                                       } else if (value < this.min) {
+                                                               this.min = value;
+                                                       }
+
+                                                       if (this.max === null) {
+                                                               this.max = value;
+                                                       } else if (value > this.max) {
+                                                               this.max = value;
+                                                       }
+                                               }, this);
+                                       }
+                               }, this);
+                       }
+               },
+
+               getPointPixelForValue: function(value, index, datasetIndex) {
+                       if (this.options.stacked) {
+                               var offsetPos = 0;
+                               var offsetNeg = 0;
+
+                               for (var i = 0; i < datasetIndex; ++i) {
+                                       if (this.data.datasets[i].data[index] < 0) {
+                                               offsetNeg += this.data.datasets[i].data[index];
+                                       } else {
+                                               offsetPos += this.data.datasets[i].data[index];
+                                       }
+                               }
+
+                               if (value < 0) {
+                                       return this.getPixelForValue(offsetNeg + value);
+                               } else {
+                                       return this.getPixelForValue(offsetPos + value);
+                               }
+                       } else {
+                               return this.getPixelForValue(value);
+                       }
+               },
+
+               // Functions needed for bar charts
+               calculateBarBase: function(datasetIndex, index) {
+                       var base = 0;
+
+                       if (this.options.stacked) {
+
+                               var value = this.data.datasets[datasetIndex].data[index];
+
+                               if (value < 0) {
+                                       for (var i = 0; i < datasetIndex; i++) {
+                                               if (this.data.datasets[i].yAxisID === this.id) {
+                                                       base += this.data.datasets[i].data[index] < 0 ? this.data.datasets[i].data[index] : 0;
+                                               }
+                                       }
+                               } else {
+                                       for (var j = 0; j < datasetIndex; j++) {
+                                               if (this.data.datasets[j].yAxisID === this.id) {
+                                                       base += this.data.datasets[j].data[index] > 0 ? this.data.datasets[j].data[index] : 0;
+                                               }
+                                       }
+                               }
+
+                               return this.getPixelForValue(base);
+                       }
+
+                       base = this.getPixelForValue(this.min);
+
+                       if (this.beginAtZero || ((this.min <= 0 && this.max >= 0) || (this.min >= 0 && this.max <= 0))) {
+                               base = this.getPixelForValue(0);
+                               base += this.options.gridLines.lineWidth;
+                       } else if (this.min < 0 && this.max < 0) {
+                               // All values are negative. Use the top as the base
+                               base = this.getPixelForValue(this.max);
+                       }
+
+                       return base;
+
+               },
+               calculateBarY: function(datasetIndex, index) {
+                       var value = this.data.datasets[datasetIndex].data[index];
+
+                       if (this.options.stacked) {
+
+                               var sumPos = 0,
+                                       sumNeg = 0;
+
+                               for (var i = 0; i < datasetIndex; i++) {
+                                       if (this.data.datasets[i].data[index] < 0) {
+                                               sumNeg += this.data.datasets[i].data[index] || 0;
+                                       } else {
+                                               sumPos += this.data.datasets[i].data[index] || 0;
+                                       }
+                               }
+
+                               if (value < 0) {
+                                       return this.getPixelForValue(sumNeg + value);
+                               } else {
+                                       return this.getPixelForValue(sumPos + value);
+                               }
+
+                               return this.getPixelForValue(value);
+                       }
+
+                       var offset = 0;
+
+                       for (var j = datasetIndex; j < this.data.datasets.length; j++) {
+                               if (j === datasetIndex && value) {
+                                       offset += value;
+                               } else {
+                                       offset = offset + value;
+                               }
+                       }
+
+                       return this.getPixelForValue(value);
+               },
+
+               // 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) {
+                       this.calculateRange();
+                       this.generateTicks(maxWidth, maxHeight);
+                       this.buildLabels();
+
+                       var minSize = {
+                               width: 0,
+                               height: 0,
+                       };
+
+                       // In a horizontal axis, we need some room for the scale to be drawn
+                       //
+                       //      -----------------------------------------------------
+                       //          |           |           |           |           |
+                       //
+                       // In a vertical axis, we need some room for the scale to be drawn.
+                       // The actual grid lines will be drawn on the chart area, however, we need to show 
+                       // ticks where the axis actually is.
+                       // We will allocate 25px for this width
+                       //      |
+                       //     -|
+                       //      |
+                       //      |
+                       //     -|
+                       //      |
+                       //      |
+                       //     -|
+
+
+                       // Width
+                       if (this.isHorizontal()) {
+                               minSize.width = maxWidth; // fill all the width
+                       } else {
+                               minSize.width = this.options.gridLines.show && this.options.display ? 10 : 0;
+                       }
+
+                       // height
+                       if (this.isHorizontal()) {
+                               minSize.height = this.options.gridLines.show && this.options.display ? 10 : 0;
+                       } else {
+                               minSize.height = maxHeight; // fill all the height
+                       }
+
+
+
+                       if (this.options.labels.show && this.options.display) {
+                               // Don't bother fitting the labels if we are not showing them
+                               var labelFont = helpers.fontString(this.options.labels.fontSize,
+                                       this.options.labels.fontStyle, this.options.labels.fontFamily);
+
+                               if (this.isHorizontal()) {
+                                       // A horizontal axis is more constrained by the height.
+                                       var maxLabelHeight = maxHeight - minSize.height;
+                                       var labelHeight = 1.5 * this.options.labels.fontSize;
+                                       minSize.height = Math.min(maxHeight, minSize.height + labelHeight);
+                               } else {
+                                       // A vertical axis is more constrained by the width. Labels are the dominant factor 
+                                       // here, so get that length first
+                                       var maxLabelWidth = maxWidth - minSize.width;
+                                       var largestTextWidth = helpers.longestText(this.ctx, labelFont, this.labels);
+
+                                       if (largestTextWidth < maxLabelWidth) {
+                                               // We don't need all the room
+                                               minSize.width += largestTextWidth;
+                                       } else {
+                                               // Expand to max size
+                                               minSize.width = maxWidth;
+                                       }
+                               }
+                       }
+
+                       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 setContextLineSettings;
+                               var hasZero;
+
+                               // Make sure we draw text in the correct color
+                               this.ctx.fillStyle = this.options.labels.fontColor;
+
+                               if (this.isHorizontal()) {
+                                       if (this.options.gridLines.show) {
+                                               // Draw the horizontal line
+                                               setContextLineSettings = true;
+                                               hasZero = helpers.findNextWhere(this.ticks, function(tick) {
+                                                       return tick === 0;
+                                               }) !== undefined;
+                                               var yTickStart = this.options.position == "bottom" ? this.top : this.bottom - 5;
+                                               var yTickEnd = this.options.position == "bottom" ? this.top + 5 : this.bottom;
+
+                                               helpers.each(this.ticks, function(tick, index) {
+                                                       // Grid lines are vertical
+                                                       var xValue = this.getPixelForValue(tick);
+
+                                                       if (tick === 0 || (!hasZero && index === 0)) {
+                                                               // Draw the 0 point specially or the left if there is no 0
+                                                               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;
+                                                       }
+
+                                                       xValue += helpers.aliasPixel(this.ctx.lineWidth);
+
+                                                       // Draw the label area
+                                                       this.ctx.beginPath();
+
+                                                       if (this.options.gridLines.drawTicks) {
+                                                               this.ctx.moveTo(xValue, yTickStart);
+                                                               this.ctx.lineTo(xValue, yTickEnd);
+                                                       }
+
+                                                       // Draw the chart area
+                                                       if (this.options.gridLines.drawOnChartArea) {
+                                                               this.ctx.moveTo(xValue, chartArea.top);
+                                                               this.ctx.lineTo(xValue, chartArea.bottom);
+                                                       }
+
+                                                       // Need to stroke in the loop because we are potentially changing line widths & colours
+                                                       this.ctx.stroke();
+                                               }, this);
+                                       }
+
+                                       if (this.options.labels.show) {
+                                               // Draw the labels
+
+                                               var labelStartY;
+
+                                               if (this.options.position == "top") {
+                                                       labelStartY = this.bottom - 10;
+                                                       this.ctx.textBaseline = "bottom";
+                                               } else {
+                                                       // bottom side
+                                                       labelStartY = this.top + 10;
+                                                       this.ctx.textBaseline = "top";
+                                               }
+
+                                               this.ctx.textAlign = "center";
+                                               this.ctx.font = helpers.fontString(this.options.labels.fontSize, this.options.labels.fontStyle, this.options.labels.fontFamily);
+
+                                               helpers.each(this.labels, function(label, index) {
+                                                       var xValue = this.getPixelForValue(this.ticks[index]);
+                                                       this.ctx.fillText(label, xValue, labelStartY);
+                                               }, this);
+                                       }
+                               } else {
+                                       // Vertical
+                                       if (this.options.gridLines.show) {
+
+                                               // Draw the vertical line
+                                               setContextLineSettings = true;
+                                               hasZero = helpers.findNextWhere(this.ticks, function(tick) {
+                                                       return tick === 0;
+                                               }) !== undefined;
+                                               var xTickStart = this.options.position == "right" ? this.left : this.right - 5;
+                                               var xTickEnd = this.options.position == "right" ? this.left + 5 : this.right;
+
+                                               helpers.each(this.ticks, function(tick, index) {
+                                                       // Grid lines are horizontal
+                                                       var yValue = this.getPixelForValue(tick);
+
+                                                       if (tick === 0 || (!hasZero && index === 0)) {
+                                                               // Draw the 0 point specially or the bottom if there is no 0
+                                                               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; // use boolean to indicate that we only want to do this once
+                                                       }
+
+                                                       yValue += helpers.aliasPixel(this.ctx.lineWidth);
+
+                                                       // Draw the label area
+                                                       this.ctx.beginPath();
+
+                                                       if (this.options.gridLines.drawTicks) {
+                                                               this.ctx.moveTo(xTickStart, yValue);
+                                                               this.ctx.lineTo(xTickEnd, yValue);
+                                                       }
+
+                                                       // Draw the chart area
+                                                       if (this.options.gridLines.drawOnChartArea) {
+                                                               this.ctx.moveTo(chartArea.left, yValue);
+                                                               this.ctx.lineTo(chartArea.right, yValue);
+                                                       }
+
+                                                       this.ctx.stroke();
+                                               }, this);
+                                       }
+
+                                       if (this.options.labels.show) {
+                                               // Draw the labels
+
+                                               var labelStartX;
+
+                                               if (this.options.position == "left") {
+                                                       labelStartX = this.right - 10;
+                                                       this.ctx.textAlign = "right";
+                                               } else {
+                                                       // right side
+                                                       labelStartX = this.left + 5;
+                                                       this.ctx.textAlign = "left";
+                                               }
+
+                                               this.ctx.textBaseline = "middle";
+                                               this.ctx.font = helpers.fontString(this.options.labels.fontSize, this.options.labels.fontStyle, this.options.labels.fontFamily);
+
+                                               helpers.each(this.labels, function(label, index) {
+                                                       var yValue = this.getPixelForValue(this.ticks[index]);
+                                                       this.ctx.fillText(label, labelStartX, yValue);
+                                               }, this);
+                                       }
+                               }
+                       }
+               }
+       });
+       Chart.scales.registerScaleType("linear", LinearScale);
 
 
 }).call(this);