X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;ds=sidebyside;f=dygraph-canvas.js;h=90d1b4eda04309310f6c4a4081b6c2cdfa4f42d1;hb=88e95c462340958bdfd0ac4c0736b94c5fd21024;hp=6c3a4116ccf2bda0a6b739200cd52ecc94cc1989;hpb=c3e1495b51f16b328b6a161078fdb06d39401169;p=dygraphs.git

diff --git a/dygraph-canvas.js b/dygraph-canvas.js
index 6c3a411..90d1b4e 100644
--- a/dygraph-canvas.js
+++ b/dygraph-canvas.js
@@ -1,5 +1,8 @@
-// Copyright 2006 Dan Vanderkam (danvdk@gmail.com)
-// All Rights Reserved.
+/**
+ * @license
+ * Copyright 2006 Dan Vanderkam (danvdk@gmail.com)
+ * MIT-licensed (http://opensource.org/licenses/MIT)
+ */
 
 /**
  * @fileoverview Based on PlotKit.CanvasRenderer, but modified to meet the
@@ -260,7 +263,7 @@ DygraphCanvasRenderer.prototype._renderAxis = function() {
     // height: this.attr_('axisLabelFontSize') + 2 + "px",
     overflow: "hidden"
   };
-  var makeDiv = function(txt, axis) {
+  var makeDiv = function(txt, axis, prec_axis) {
     var div = document.createElement("div");
     for (var name in labelStyle) {
       if (labelStyle.hasOwnProperty(name)) {
@@ -268,8 +271,9 @@ DygraphCanvasRenderer.prototype._renderAxis = function() {
       }
     }
     var inner_div = document.createElement("div");
-    // TODO(danvk): separate class for secondary y-axis
-    inner_div.className = 'dygraph-axis-label dygraph-axis-label-' + axis;
+    inner_div.className = 'dygraph-axis-label' +
+                          ' dygraph-axis-label-' + axis +
+                          (prec_axis ? ' dygraph-axis-label-' + prec_axis : '');
     inner_div.appendChild(document.createTextNode(txt));
     div.appendChild(inner_div);
     return div;
@@ -282,14 +286,17 @@ DygraphCanvasRenderer.prototype._renderAxis = function() {
 
   if (this.attr_('drawYAxis')) {
     if (this.layout.yticks && this.layout.yticks.length > 0) {
+      var num_axes = this.dygraph_.numAxes();
       for (var i = 0; i < this.layout.yticks.length; i++) {
         var tick = this.layout.yticks[i];
         if (typeof(tick) == "function") return;
         var x = this.area.x;
         var sgn = 1;
+        var prec_axis = 'y1';
         if (tick[0] == 1) {  // right-side y-axis
           x = this.area.x + this.area.w;
           sgn = -1;
+          prec_axis = 'y2';
         }
         var y = this.area.y + tick[1] * this.area.h;
         context.beginPath();
@@ -298,7 +305,7 @@ DygraphCanvasRenderer.prototype._renderAxis = function() {
         context.closePath();
         context.stroke();
 
-        var label = makeDiv(tick[2], 'y');
+        var label = makeDiv(tick[2], 'y', num_axes == 2 ? prec_axis : null);
         var top = (y - this.attr_('axisLabelFontSize') / 2);
         if (top < 0) top = 0;
 
@@ -592,6 +599,10 @@ DygraphCanvasRenderer.prototype._renderAnnotations = function() {
  * Overrides the CanvasRenderer method to draw error bars
  */
 DygraphCanvasRenderer.prototype._renderLineChart = function() {
+  var isNullOrNaN = function(x) {
+    return (x === null || isNaN(x));
+  };
+  
   // TODO(danvk): use this.attr_ for many of these.
   var context = this.elementContext;
   var fillAlpha = this.attr_('fillAlpha');
@@ -658,12 +669,10 @@ DygraphCanvasRenderer.prototype._renderLineChart = function() {
 
           // TODO(danvk): here
           if (stepPlot) {
-            var newYs = [ prevY - point.errorPlus * yscale,
-                          prevY + point.errorMinus * yscale ];
+            var newYs = [ point.y_bottom, point.y_top ];
             prevY = point.y;
           } else {
-            var newYs = [ point.y - point.errorPlus * yscale,
-                          point.y + point.errorMinus * yscale ];
+            var newYs = [ point.y_bottom, point.y_top ];
           }
           newYs[0] = this.area.h * newYs[0] + this.area.y;
           newYs[1] = this.area.h * newYs[1] + this.area.y;
@@ -747,11 +756,7 @@ DygraphCanvasRenderer.prototype._renderLineChart = function() {
     }
   }
 
-  var isNullOrNaN = function(x) {
-    return (x === null || isNaN(x));
-  };
-
-  // Drawing of a graph without error bars.
+  // Drawing the lines.
   var firstIndexInSet = 0;
   var afterLastIndexInSet = 0;
   var setLength = 0;
@@ -786,10 +791,15 @@ DygraphCanvasRenderer.prototype._renderLineChart = function() {
         // and next points are null.
         var isIsolated = (!prevX && (j == points.length - 1 ||
                                      isNullOrNaN(points[j+1].canvasy)));
-         if (prevX === null) {
+        if (prevX === null) {
           prevX = point.canvasx;
           prevY = point.canvasy;
         } else {
+          // Skip over points that will be drawn in the same pixel.
+          if (Math.round(prevX) == Math.round(point.canvasx) &&
+              Math.round(prevY) == Math.round(point.canvasy)) {
+            continue;
+          }
           // TODO(antrob): skip over points that lie on a line that is already
           // going to be drawn. There is no need to have more than 2
           // consecutive points that are collinear.
@@ -807,12 +817,13 @@ DygraphCanvasRenderer.prototype._renderLineChart = function() {
             ctx.stroke();
           }
         }
-         if (drawPoints || isIsolated) {
-         ctx.beginPath();
-         ctx.fillStyle = color;
-         ctx.arc(point.canvasx, point.canvasy, pointSize,
-                 0, 2 * Math.PI, false);
-         ctx.fill();
+
+        if (drawPoints || isIsolated) {
+          ctx.beginPath();
+          ctx.fillStyle = color;
+          ctx.arc(point.canvasx, point.canvasy, pointSize,
+                  0, 2 * Math.PI, false);
+          ctx.fill();
         }
       }
     }