notes; stop clipping

[dygraphs.git] / dygraph-canvas.js

diff --git a/dygraph-canvas.js b/dygraph-canvas.js
index 8cadd2d..45c02ff 100644 (file)
--- a/dygraph-canvas.js
+++ b/dygraph-canvas.js
@@ -70,6 +70,7 @@ DygraphLayout.prototype._evaluateLineCharts = function() {
     for (var j = 0; j < dataset.length; j++) {
       var item = dataset[j];
       var point = {
+        // TODO(danvk): here
         x: ((parseFloat(item[0]) - this.minxval) * this.xscale),
         y: 1.0 - ((parseFloat(item[1]) - this.minyval) * this.yscale),
         xval: parseFloat(item[0]),
@@ -84,9 +85,9 @@ DygraphLayout.prototype._evaluateLineCharts = function() {
       if (point.y >= 1.0) {
         point.y = 1.0;
       }
-      if ((point.x >= 0.0) && (point.x <= 1.0)) {
+      // if ((point.x >= 0.0) && (point.x <= 1.0)) {
         this.points.push(point);
-      }
+      // }
     }
   }
 };
@@ -186,7 +187,8 @@ DygraphCanvasRenderer = function(dygraph, element, layout, options) {
     "axisLabelWidth": 50,
     "drawYGrid": true,
     "drawXGrid": true,
-    "gridLineColor": "rgb(128,128,128)"
+    "gridLineColor": "rgb(128,128,128)",
+    "fillAlpha": 0.15,
   };
   Dygraph.update(this.options, options);
 
@@ -445,6 +447,7 @@ DygraphCanvasRenderer.prototype._renderLineChart = function() {
   var context = this.element.getContext("2d");
   var colorCount = this.options.colorScheme.length;
   var colorScheme = this.options.colorScheme;
+  var fillAlpha = this.options.fillAlpha;
   var errorBars = this.layout.options.errorBars;
   var fillGraph = this.layout.options.fillGraph;
 
@@ -456,7 +459,8 @@ DygraphCanvasRenderer.prototype._renderLineChart = function() {
   }
   var setCount = setNames.length;
 
-  //Update Points
+  // Update Points
+  // TODO(danvk): here
   for (var i = 0; i < this.layout.points.length; i++) {
     var point = this.layout.points[i];
     point.canvasx = this.area.w * point.x + this.area.x;
@@ -486,7 +490,8 @@ DygraphCanvasRenderer.prototype._renderLineChart = function() {
       var yscale = this.layout.yscale;
       // should be same color as the lines but only 15% opaque.
       var rgb = new RGBColor(color);
-      var err_color = 'rgba(' + rgb.r + ',' + rgb.g + ',' + rgb.b + ',0.15)';
+      var err_color = 'rgba(' + rgb.r + ',' + rgb.g + ',' + rgb.b + ',' +
+                            fillAlpha + ')';
       ctx.fillStyle = err_color;
       ctx.beginPath();
       for (var j = 0; j < this.layout.points.length; j++) {
@@ -497,6 +502,7 @@ DygraphCanvasRenderer.prototype._renderLineChart = function() {
             prevX = -1;
             continue;
           }
+          // TODO(danvk): here
           var newYs = [ point.y - point.errorPlus * yscale,
                         point.y + point.errorMinus * yscale ];
           newYs[0] = this.area.h * newYs[0] + this.area.y;
@@ -516,6 +522,7 @@ DygraphCanvasRenderer.prototype._renderLineChart = function() {
       ctx.fill();
     }
   } else if (fillGraph) {
+    // TODO(danvk): merge this code with the logic above; they're very similar.
     for (var i = 0; i < setCount; i++) {
       var setName = setNames[i];
       var setNameLast;
@@ -532,7 +539,8 @@ DygraphCanvasRenderer.prototype._renderLineChart = function() {
       var yscale = this.layout.yscale;
       // should be same color as the lines but only 15% opaque.
       var rgb = new RGBColor(color);
-      var err_color = 'rgba(' + rgb.r + ',' + rgb.g + ',' + rgb.b + ',0.15)';
+      var err_color = 'rgba(' + rgb.r + ',' + rgb.g + ',' + rgb.b + ',' +
+                            fillAlpha + ')';
       ctx.fillStyle = err_color;
       ctx.beginPath();
       for (var j = 0; j < this.layout.points.length; j++) {