]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
initial logarithmic scale
authorEvert Timberg <evert.timberg@gmail.com>
Sat, 8 Aug 2015 22:34:19 +0000 (18:34 -0400)
committerEvert Timberg <evert.timberg@gmail.com>
Sat, 8 Aug 2015 22:34:19 +0000 (18:34 -0400)
samples/line-logarithmic.html [new file with mode: 0644]
src/scales/scale.logarithmic.js [new file with mode: 0644]

diff --git a/samples/line-logarithmic.html b/samples/line-logarithmic.html
new file mode 100644 (file)
index 0000000..1123c23
--- /dev/null
@@ -0,0 +1,154 @@
+<!doctype html>
+<html>
+
+<head>
+    <title>Line Chart</title>
+    <script src="../Chart.js"></script>
+    <script src="../node_modules/jquery/dist/jquery.min.js"></script>
+    <style>
+    canvas {
+        -webkit-box-shadow: 0 0 20px 0 rgba(0, 0, 0, .5);
+    }
+    </style>
+</head>
+
+<body>
+    <div style="width:50%;">
+        <canvas id="canvas" style="width:100%;height:100%"></canvas>
+    </div>
+    <br>
+    <br>
+    <button id="randomizeData">Randomize Data</button>
+    <button id="addDataset">Add Dataset</button>
+    <button id="removeDataset">Remove Dataset</button>
+    <button id="addData">Add Data</button>
+    <button id="removeData">Remove Data</button>
+    <div>
+        <h3>Legend</h3>
+        <div id="legendContainer">
+            
+        </div>
+    </div>
+    <script>
+    var randomScalingFactor = function() {
+        return Math.round(Math.random() * 10.0) * Math.pow(10, Math.ceil(Math.random() * 5));
+    };
+    var randomColorFactor = function() {
+        return Math.round(Math.random() * 255);
+    };
+    var randomColor = function(opacity) {
+        return 'rgba(' + randomColorFactor() + ',' + randomColorFactor() + ',' + randomColorFactor() + ',' + (opacity || '.3') + ')';
+    };
+
+    var config = {
+        type: 'line',
+        data: {
+            labels: ["January", "February", "March", "April", "May", "June", "July"],
+            datasets: [{
+                label: "My First dataset",
+                data: [randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor()],
+                fill: false,
+                borderDash: [5, 5],
+            }, {
+                label: "My Second dataset",
+                data: [randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor()],
+            }]
+        },
+        options: {
+            responsive: true,
+            scales: {
+                xAxes: [{
+                    display: true
+                }],
+                yAxes: [{
+                    display: true,
+                    type: 'logarithmic'
+                }]
+            }
+        }
+    };
+
+    $.each(config.data.datasets, function(i, dataset) {
+        dataset.borderColor = randomColor(0.4);
+        dataset.backgroundColor = randomColor(0.5);
+        dataset.pointBorderColor = randomColor(0.7);
+        dataset.pointBackgroundColor = randomColor(0.5);
+        dataset.pointBorderWidth = 1;
+    });
+
+    console.log(config.data);
+
+    window.onload = function() {
+        var ctx = document.getElementById("canvas").getContext("2d");
+        window.myLine = new Chart(ctx, config);
+
+        updateLegend();
+    };
+
+    function updateLegend() {
+        $legendContainer = $('#legendContainer');
+        $legendContainer.empty();
+        $legendContainer.append(window.myLine.generateLegend());
+    }
+
+    $('#randomizeData').click(function() {
+        $.each(config.data.datasets, function(i, dataset) {
+            dataset.data = dataset.data.map(function() {
+                return randomScalingFactor();
+            });
+
+        });
+
+        window.myLine.update();
+        updateLegend();
+    });
+
+    $('#addDataset').click(function() {
+        var newDataset = {
+            label: 'Dataset ' + config.data.datasets.length,
+            borderColor: randomColor(0.4),
+            backgroundColor: randomColor(0.5),
+            pointBorderColor: randomColor(0.7),
+            pointBackgroundColor: randomColor(0.5),
+            pointBorderWidth: 1,
+            data: [],
+        };
+
+        for (var index = 0; index < config.data.labels.length; ++index) {
+            newDataset.data.push(randomScalingFactor());
+        }
+
+        window.myLine.addDataset(newDataset);
+        updateLegend();
+    });
+
+    $('#addData').click(function() {
+        if (config.data.datasets.length > 0) {
+            config.data.labels.push('dataset #' + config.data.labels.length);
+
+            for (var index = 0; index < config.data.datasets.length; ++index) {
+                window.myLine.addData(randomScalingFactor(), index);
+            }
+
+            updateLegend();
+        }
+    });
+
+    $('#removeDataset').click(function() {
+        window.myLine.removeDataset(0);
+        updateLegend();
+    });
+
+    $('#removeData').click(function() {
+        config.data.labels.splice(-1, 1); // remove the label first
+
+        config.data.datasets.forEach(function(dataset, datasetIndex) {
+            window.myLine.removeData(datasetIndex, -1);
+        });
+
+        updateLegend();
+    });
+    </script>
+</body>
+
+</html>
diff --git a/src/scales/scale.logarithmic.js b/src/scales/scale.logarithmic.js
new file mode 100644 (file)
index 0000000..68897a9
--- /dev/null
@@ -0,0 +1,643 @@
+(function() {
+       "use strict";
+
+       var root = this,
+               Chart = root.Chart,
+               helpers = Chart.helpers;
+
+       var defaultConfig = {
+               display: true,
+               position: "left",
+
+               // grid line settings
+               gridLines: {
+                       show: true,
+                       color: "rgba(0, 0, 0, 0.1)",
+                       lineWidth: 1,
+                       drawOnChartArea: true,
+                       drawTicks: true, // draw ticks extending towards the label
+                       zeroLineWidth: 1,
+                       zeroLineColor: "rgba(0,0,0,0.25)",
+               },
+
+               // scale numbers
+               reverse: false,
+               beginAtZero: false,
+               override: null,
+
+               // label settings
+               labels: {
+                       show: true,
+                       mirror: false,
+                       padding: 10,
+                       template: "<%=value.toExponential()%>",
+                       fontSize: 12,
+                       fontStyle: "normal",
+                       fontColor: "#666",
+                       fontFamily: "Helvetica Neue"
+               }
+       };
+
+       var LogarithmicScale = Chart.Element.extend({
+               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);
+                                       this.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 minExponent = Math.floor(helpers.log10(this.min));
+                               var maxExponent = Math.ceil(helpers.log10(this.max));
+
+                               for (var exponent = minExponent; exponent < maxExponent; ++exponent) {
+                                       /*this.ticks.push(1.0 * Math.pow(10, exponent));
+                                       this.ticks.push(2.0 * Math.pow(10, exponent));
+                                       this.ticks.push(5.0 * Math.pow(10, exponent));*/
+                                       for (var i = 1; i < 10; ++i) {
+                                               if (i === 1 || i === 2 || i === 3 || i === 5 || i === 7) {
+                                                       this.ticks.push(i * Math.pow(10, exponent));
+                                               }
+                                       }
+                               }
+
+                               this.ticks.push(1.0 * Math.pow(10, maxExponent));
+
+                               /*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);
+
+                       if (this.options.reverse) {
+                               this.ticks.reverse();
+
+                               this.start = this.max;
+                               this.end = this.min;
+                       } else {
+                               this.start = this.min;
+                               this.end = this.max;
+                       }
+               },
+               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.labels.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);
+               },
+               // 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
+                       var pixel;
+                       var range = helpers.log10(this.end) - helpers.log10(this.start);
+
+                       if (this.isHorizontal()) {
+                               if (value === 0) {
+                                       pixel = this.left + this.paddingLeft;
+                               } else {
+                                       var innerWidth = this.width - (this.paddingLeft + this.paddingRight);
+                                       pixel = this.left + (innerWidth / range * (helpers.log10(value) - helpers.log10(this.start)));
+                                       pixel += this.paddingLeft;
+                               }
+                       } else {
+                               // Bottom - top since pixels increase downard on a screen
+                               if (value === 0) {
+                                       pixel = this.top + this.paddingTop;
+                               } else  {
+                                       var innerHeight = this.height - (this.paddingTop + this.paddingBottom);
+                                       pixel = this.bottom - (innerHeight / range * (helpers.log10(value) - helpers.log10(this.start)));
+                                       pixel += this.paddingTop;
+                               }
+                       }
+
+                       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 (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;
+
+                                                       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 (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) {
+                                                               this.min = value;
+                                                       }
+
+                                                       if (this.max === null) {
+                                                               this.max = value;
+                                                       } else if (value > this.max) {
+                                                               this.max = value;
+                                                       }
+                                               }, this);
+                                       }
+                               }, this);
+                       }
+
+                       if (this.min === this.max) {
+                               this.min--;
+                               this.max++;
+                       }
+               },
+
+               getPointPixelForValue: function(rawValue, index, datasetIndex) {
+                       var value = this.getRightValue(rawValue);
+
+                       if (this.options.stacked) {
+                               var offsetPos = 0;
+                               var offsetNeg = 0;
+
+                               for (var i = this.data.datasets.length - 1; 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, margins) {
+                       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
+                       }
+
+                       this.paddingLeft = 0;
+                       this.paddingRight = 0;
+                       this.paddingTop = 0;
+                       this.paddingBottom = 0;
+
+
+                       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);
+
+                                       var labelFont = helpers.fontString(this.options.labels.fontSize, this.options.labels.fontStyle, this.options.labels.fontFamily);
+                                       this.ctx.font = labelFont;
+
+                                       var firstLabelWidth = this.ctx.measureText(this.labels[0]).width;
+                                       var lastLabelWidth = this.ctx.measureText(this.labels[this.labels.length - 1]).width;
+
+                                       // Ensure that our labels are always inside the canvas
+                                       this.paddingLeft = firstLabelWidth / 2;
+                                       this.paddingRight = lastLabelWidth / 2;
+                               } 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;
+                                               minSize.width += 3; // extra padding
+                                       } else {
+                                               // Expand to max size
+                                               minSize.width = maxWidth;
+                                       }
+
+                                       this.paddingTop = this.options.labels.fontSize / 2;
+                                       this.paddingBottom = this.options.labels.fontSize / 2;
+                               }
+                       }
+
+                       if (margins) {
+                               this.paddingLeft -= margins.left;
+                               this.paddingTop -= margins.top;
+                               this.paddingRight -= margins.right;
+                               this.paddingBottom -= margins.bottom;
+
+                               this.paddingLeft = Math.max(this.paddingLeft, 0);
+                               this.paddingTop = Math.max(this.paddingTop, 0);
+                               this.paddingRight = Math.max(this.paddingRight, 0);
+                               this.paddingBottom = Math.max(this.paddingBottom, 0);
+                       }
+
+                       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") {
+                                                       if (this.options.labels.mirror) {
+                                                               labelStartX = this.right + this.options.labels.padding;
+                                                               this.ctx.textAlign = "left";
+                                                       } else {
+                                                               labelStartX = this.right - this.options.labels.padding;
+                                                               this.ctx.textAlign = "right";
+                                                       }
+                                               } else {
+                                                       // right side
+                                                       if (this.options.labels.mirror) {
+                                                               labelStartX = this.left - this.options.labels.padding;
+                                                               this.ctx.textAlign = "right";
+                                                       } else {
+                                                               labelStartX = this.left + this.options.labels.padding;
+                                                               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.scaleService.registerScaleType("logarithmic", LogarithmicScale, defaultConfig);
+
+}).call(this);