From 2f56cd46850c9ba272029038ded19adfa5ba2f3b Mon Sep 17 00:00:00 2001
From: eichsjul <julian.eichstaedt@ch.sauter-bc.com>
Date: Thu, 31 Jan 2013 14:32:58 +0100
Subject: [PATCH 1/7] FEATURE: Added support for stepPlot per-series.

---
 dygraph-canvas.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/dygraph-canvas.js b/dygraph-canvas.js
index 89d28b47f..257314770 100644
--- a/dygraph-canvas.js
+++ b/dygraph-canvas.js
@@ -261,7 +261,12 @@ DygraphCanvasRenderer._drawStyledLine = function(e,
     drawPointCallback, pointSize) {
   var g = e.dygraph;
   // TODO(konigsberg): Compute attributes outside this method call.
-  var stepPlot = g.getOption("stepPlot");  // TODO(danvk): per-series
+  var stepPlot = g.getOption("stepPlot");
+  var seriesStepPlot = g.getOption("stepPlot",e.setName);
+  if(seriesStepPlot !== undefined){
+	  stepPlot = seriesStepPlot;
+  }
+
   if (!Dygraph.isArrayLike(strokePattern)) {
     strokePattern = null;
   }

From de9a8181064aa767e1c70c31a0027a0324cc33c6 Mon Sep 17 00:00:00 2001
From: "Damien Buhl (alias daminetreg)" <damien.buhl@lecbna.org>
Date: Thu, 31 Jan 2013 16:08:30 +0100
Subject: [PATCH 2/7] BUG FIX: Fixed indentation in respect to the jslint
 rules.

---
 dygraph-canvas.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dygraph-canvas.js b/dygraph-canvas.js
index 257314770..65678083c 100644
--- a/dygraph-canvas.js
+++ b/dygraph-canvas.js
@@ -263,8 +263,8 @@ DygraphCanvasRenderer._drawStyledLine = function(e,
   // TODO(konigsberg): Compute attributes outside this method call.
   var stepPlot = g.getOption("stepPlot");
   var seriesStepPlot = g.getOption("stepPlot",e.setName);
-  if(seriesStepPlot !== undefined){
-	  stepPlot = seriesStepPlot;
+  if(seriesStepPlot !== undefined) {
+    stepPlot = seriesStepPlot;
   }
 
   if (!Dygraph.isArrayLike(strokePattern)) {

From 0ce5b19b6346c9e55494997c06f460fedcd48b11 Mon Sep 17 00:00:00 2001
From: eichsjul <julian.eichstaedt@ch.sauter-bc.com>
Date: Thu, 31 Jan 2013 16:42:15 +0100
Subject: [PATCH 3/7] FEATURE: Added stepPlot option per series for all
 plotters.

---
 dygraph-canvas.js | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/dygraph-canvas.js b/dygraph-canvas.js
index 65678083c..5305ded52 100644
--- a/dygraph-canvas.js
+++ b/dygraph-canvas.js
@@ -261,11 +261,7 @@ DygraphCanvasRenderer._drawStyledLine = function(e,
     drawPointCallback, pointSize) {
   var g = e.dygraph;
   // TODO(konigsberg): Compute attributes outside this method call.
-  var stepPlot = g.getOption("stepPlot");
-  var seriesStepPlot = g.getOption("stepPlot",e.setName);
-  if(seriesStepPlot !== undefined) {
-    stepPlot = seriesStepPlot;
-  }
+  var stepPlot = g.getOption("stepPlot", e.setName);
 
   if (!Dygraph.isArrayLike(strokePattern)) {
     strokePattern = null;
@@ -596,7 +592,7 @@ DygraphCanvasRenderer._errorPlotter = function(e) {
   var ctx = e.drawingContext;
   var color = e.color;
   var fillAlpha = g.getOption('fillAlpha', setName);
-  var stepPlot = g.getOption('stepPlot');  // TODO(danvk): per-series
+  var stepPlot = g.getOption("stepPlot", setName);
   var points = e.points;
 
   var iter = Dygraph.createIterator(points, 0, points.length,
@@ -696,7 +692,7 @@ DygraphCanvasRenderer._fillPlotter = function(e) {
   var setCount = sets.length;
 
   var fillAlpha = g.getOption('fillAlpha');
-  var stepPlot = g.getOption('stepPlot');
+  var stepPlot = g.getOption('stepPlot', e.setName);
   var stackedGraph = g.getOption("stackedGraph");
   var colors = g.getColors();
 

From 104d87c50866e6e0c6a877e662b7c08e7bf4d780 Mon Sep 17 00:00:00 2001
From: eichsjul <julian.eichstaedt@ch.sauter-bc.com>
Date: Wed, 6 Feb 2013 13:48:35 +0100
Subject: [PATCH 4/7] BUGFIX: stepPlot per series now also works correctly for
 the stackedGraph and fillGraph options

---
 dygraph-canvas.js            |  23 +++----
 dygraph-options-reference.js |   2 +-
 tests/steps.html             | 112 +++++++++++++++++++++++++++++++++++
 3 files changed, 126 insertions(+), 11 deletions(-)

diff --git a/dygraph-canvas.js b/dygraph-canvas.js
index 5305ded52..fa0dd800b 100644
--- a/dygraph-canvas.js
+++ b/dygraph-canvas.js
@@ -692,18 +692,19 @@ DygraphCanvasRenderer._fillPlotter = function(e) {
   var setCount = sets.length;
 
   var fillAlpha = g.getOption('fillAlpha');
-  var stepPlot = g.getOption('stepPlot', e.setName);
   var stackedGraph = g.getOption("stackedGraph");
   var colors = g.getColors();
 
   var baseline = {};  // for stacked graphs: baseline for filling
   var currBaseline;
+  var prevStepPlot;  // for different line drawing modes (line/step) per series
 
   // process sets in reverse order (needed for stacked graphs)
   for (var setIdx = setCount - 1; setIdx >= 0; setIdx--) {
     var setName = setNames[setIdx];
     if (!g.getOption('fillGraph', setName)) continue;
-
+    
+    var stepPlot = g.getOption('stepPlot', setName);
     var color = colors[setIdx];
     var axis = g.axisPropertiesForSeries(setName);
     var axisY = 1.0 + axis.minyval * axis.yscale;
@@ -738,7 +739,7 @@ DygraphCanvasRenderer._fillPlotter = function(e) {
         if (currBaseline === undefined) {
           lastY = axisY;
         } else {
-          if(stepPlot) {
+          if(prevStepPlot) {
             lastY = currBaseline[0];
           } else {
             lastY = currBaseline;
@@ -763,17 +764,18 @@ DygraphCanvasRenderer._fillPlotter = function(e) {
       }
       if (!isNaN(prevX)) {
         ctx.moveTo(prevX, prevYs[0]);
-
+        
+        // Move to top fill point
         if (stepPlot) {
           ctx.lineTo(point.canvasx, prevYs[0]);
-          if(currBaseline) {
-            // Draw to the bottom of the baseline
-            ctx.lineTo(point.canvasx, currBaseline[1]);
-          } else {
-            ctx.lineTo(point.canvasx, newYs[1]);
-          }
         } else {
           ctx.lineTo(point.canvasx, newYs[0]);
+        }
+        // Move to bottom fill point
+        if (prevStepPlot && currBaseline) {
+          // Draw to the bottom of the baseline
+          ctx.lineTo(point.canvasx, currBaseline[1]);
+        } else {
           ctx.lineTo(point.canvasx, newYs[1]);
         }
 
@@ -783,6 +785,7 @@ DygraphCanvasRenderer._fillPlotter = function(e) {
       prevYs = newYs;
       prevX = point.canvasx;
     }
+    prevStepPlot = stepPlot;
     ctx.fill();
   }
 };
diff --git a/dygraph-options-reference.js b/dygraph-options-reference.js
index 0f601d157..de17decee 100644
--- a/dygraph-options-reference.js
+++ b/dygraph-options-reference.js
@@ -469,7 +469,7 @@ Dygraph.OPTIONS_REFERENCE =  // <JSON>
     "default": "false",
     "labels": ["Data Line display"],
     "type": "boolean",
-    "description": "When set, display the graph as a step plot instead of a line plot."
+    "description": "When set, display the graph as a step plot instead of a line plot. This option may either be set for the whole graph or for single series."
   },
   "labelsKMB": {
     "default": "false",
diff --git a/tests/steps.html b/tests/steps.html
index 42b736290..8c5881164 100644
--- a/tests/steps.html
+++ b/tests/steps.html
@@ -153,6 +153,118 @@
                           includeZero: true
                        });
     </script>
+	
+	<p>9: Mixed mode - step and line:</p>
+    <div id="graphdiv9"></div>
+    <script type="text/javascript">
+      g8 = new Dygraph(document.getElementById("graphdiv9"),
+                      "Date,Idle,Used\n" +
+                      "2008-05-07,70,30\n" +
+                      "2008-05-08,12,88\n" +
+                      "2008-05-09,88,12\n" +
+                      "2008-05-10,63,37\n" +
+                      "2008-05-11,35,65\n",
+                      {
+		                series: {
+						  Idle: {stepPlot: true},
+						  Used: {stepPlot: false}
+						},
+						  
+                        fillGraph: false,
+                        stackedGraph: false,
+                        includeZero: true
+                      });
+    </script>
+	
+	
+	<p>10: Mixed mode - step and line (filled):</p>
+    <div id="graphdiv10"></div>
+    <script type="text/javascript">
+      g8 = new Dygraph(document.getElementById("graphdiv10"),
+                      "Date,Idle,Used\n" +
+                      "2008-05-07,70,30\n" +
+                      "2008-05-08,12,88\n" +
+                      "2008-05-09,88,12\n" +
+                      "2008-05-10,63,37\n" +
+                      "2008-05-11,35,65\n",
+                      {
+		                series: {
+						  Idle: {stepPlot: false},
+						  Used: {stepPlot: true}
+						},
+						  
+                        fillGraph: true,
+                        stackedGraph: false,
+                        includeZero: true
+                      });
+    </script>
+
+	<p>11: Mixed mode - step and line (stacked and filled):</p>
+    <div id="graphdiv11"></div>
+    <script type="text/javascript">
+      g8 = new Dygraph(document.getElementById("graphdiv11"),
+                      "Date,Idle,Used,NotUsed,Active\n" +
+                      "2008-05-07,60,30,5,5\n" +
+                      "2008-05-08,12,73,5,10\n" +
+                      "2008-05-09,38,12,30,20\n" +
+                      "2008-05-10,50,17,23,10\n" +
+                      "2008-05-11,35,25,35,5\n",
+                      {
+		                series: {
+						  Idle: {stepPlot: false},
+						  Used: {stepPlot: true},
+						  NotUsed: {stepPlot: false},
+						  Active: {stepPlot: true}						     
+                        },
+                        fillGraph: true,
+                        stackedGraph: true,
+                        includeZero: true
+                      });
+    </script>
+	
+	<p>12: Mixed mode - step and line (errorbars):</p>
+    <div id="graphdiv12"></div>
+    <script type="text/javascript">
+      g8 = new Dygraph(document.getElementById("graphdiv12"),
+        [
+          [1, [75, 2], [50, 3]],
+          [2, [70, 5], [90, 4]],
+          [3, [80, 7], [112, 5]],
+          [4, [55, 3], [100, 2]],
+          [5, [69, 4], [85, 6]]
+        ],	
+        {		   
+          errorBars: true,
+          labels: ["X", "Data1", "Data2"],
+		  series: {
+		    Data1: {stepPlot: true},	
+		    Data2: {stepPlot: false} 
+		  }
+        }
+	  );
+    </script>
+	
+	<p>13: Mixed mode - step and line (custombars):</p>
+    <div id="graphdiv13"></div>
+    <script type="text/javascript">
+      g8 = new Dygraph(document.getElementById("graphdiv13"),
+        [
+          [1, [73, 75, 78], [50, 55, 70]],
+          [2, [65, 70, 75], [83, 91, 99]],
+          [3, [75, 85, 90], [98, 107, 117]],
+          [4, [55, 58, 61], [93, 102, 105]],
+          [5, [69, 73, 85], [80, 85, 87]]
+        ],	
+        {
+          customBars: true,
+          labels: ["X", "Data1", "Data2"],
+		  series: {
+		    Data1: {stepPlot: true},	
+		    Data2: {stepPlot: false} 
+		  }
+        }
+	  );
+    </script>
 
   </body>
 </html>

From 4fa81db559064456958ecbd49176556a2c998a91 Mon Sep 17 00:00:00 2001
From: eichsjul <julian.eichstaedt@ch.sauter-bc.com>
Date: Thu, 7 Feb 2013 10:44:16 +0100
Subject: [PATCH 5/7] FEATURE: Added tests for stepPlot option per series

---
 auto_tests/misc/local.html              |   1 +
 auto_tests/tests/stepPlot_per_series.js | 429 ++++++++++++++++++++++++
 2 files changed, 430 insertions(+)
 create mode 100644 auto_tests/tests/stepPlot_per_series.js

diff --git a/auto_tests/misc/local.html b/auto_tests/misc/local.html
index ea529fec4..d12645391 100644
--- a/auto_tests/misc/local.html
+++ b/auto_tests/misc/local.html
@@ -47,6 +47,7 @@
   <script type="text/javascript" src="../tests/scrolling_div.js"></script>
   <script type="text/javascript" src="../tests/selection.js"></script>
   <script type="text/javascript" src="../tests/simple_drawing.js"></script>
+  <script type="text/javascript" src="../tests/stepPlot_per_series.js"></script>
   <script type="text/javascript" src="../tests/stacked.js"></script>
   <!--
   <script type="text/javascript" src="../tests/tickers.js"></script>
diff --git a/auto_tests/tests/stepPlot_per_series.js b/auto_tests/tests/stepPlot_per_series.js
new file mode 100644
index 000000000..302a6cb42
--- /dev/null
+++ b/auto_tests/tests/stepPlot_per_series.js
@@ -0,0 +1,429 @@
+/**
+ * @fileoverview Test cases for the option "stepPlot" especially for the scenario where the option is not set for the whole graph but for single series.
+ *
+ * @author julian.eichstaedt@ch.sauter-bc.com (Fr. Sauter AG)
+ */
+var stepTestCase = TestCase("stepPlot_per_series");
+
+stepTestCase.prototype.setUp = function() {
+  document.body.innerHTML = "<div id='graph'></div>";
+};
+
+var _origFunc = Dygraph.getContext;
+stepTestCase.prototype.setUp = function() {
+  document.body.innerHTML = "<div id='graph'></div>";
+  Dygraph.getContext = function(canvas) {
+    return new Proxy(_origFunc(canvas));
+  };
+};
+
+stepTestCase.prototype.tearDown = function() {
+  Dygraph.getContext = _origFunc;
+};
+
+stepTestCase.prototype.testMixedModeStepAndLineFilled = function() {
+  var opts = {
+    width: 480,
+    height: 320,
+    drawXGrid: false,
+    drawYGrid: false,
+    drawXAxis: false,
+    drawYAxis: false,
+    errorBars: false,
+    labels: ["X", "Idle", "Used"],
+    series: {
+      Idle: {stepPlot: false},
+      Used: {stepPlot: true}
+    },
+    fillGraph: true,
+    stackedGraph: false,
+    includeZero: true
+  };
+
+  var data = [
+               [1, 70,30],
+               [2, 12,88],
+               [3, 88,12],
+               [4, 63,37],
+               [5, 35,65]
+             ];
+
+  var graph = document.getElementById("graph");
+  var g = new Dygraph(graph, data, opts);
+
+  htx = g.hidden_ctx_;
+
+  var attrs = {};  
+
+
+  for (var i = 0; i < data.length - 1; i++) {
+
+    var x1 = data[i][0];
+    var x2 = data[i + 1][0];
+
+    var y1 = data[i][1];
+    var y2 = data[i + 1][1];
+
+    // First series (line)
+    var xy1 = g.toDomCoords(x1, y1);
+    var xy2 = g.toDomCoords(x2, y2);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+
+    y1 = data[i][2];
+    y2 = data[i + 1][2];
+
+    // Seconds series (step)
+    // Horizontal line
+    xy1 = g.toDomCoords(x1, y1);
+    xy2 = g.toDomCoords(x2, y1);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    // Vertical line
+    xy1 = g.toDomCoords(x2, y1);
+    xy2 = g.toDomCoords(x2, y2);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+  }
+};
+
+stepTestCase.prototype.testMixedModeStepAndLineStackedAndFilled = function() {
+  var opts = {
+    width: 480,
+    height: 320,
+    drawXGrid: false,
+    drawYGrid: false,
+    drawXAxis: false,
+    drawYAxis: false,
+    errorBars: false,
+    labels: ["X", "Idle", "Used", "NotUsed", "Active"],
+    series: {
+      Idle: {stepPlot: false},
+      Used: {stepPlot: true},
+      NotUsed: {stepPlot: false},
+      Active: {stepPlot: true}
+    },
+    fillGraph: true,
+    stackedGraph: true,
+    includeZero: true
+  };
+
+  var data = [
+               [1, 60,30,5,5],
+               [2, 12,73,5,10],
+               [3, 38,12,30,20],
+               [4, 50,17,23,10],
+               [5, 35,25,35,5]
+             ];
+
+  var graph = document.getElementById("graph");
+  var g = new Dygraph(graph, data, opts);
+
+  htx = g.hidden_ctx_;
+
+  var attrs = {};  
+
+
+  for (var i = 0; i < data.length - 1; i++) {
+    
+    var x1 = data[i][0];
+    var x2 = data[i + 1][0];
+    var y1base = 0;
+    var y2base = 0;
+    var y1 = data[i][4];
+    var y2 = data[i + 1][4];
+
+
+    // Fourth series (step)
+    // Test lines
+    // Horizontal line
+    var xy1 = g.toDomCoords(x1, y1);
+    var xy2 = g.toDomCoords(x2, y1);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    // Vertical line
+    xy1 = g.toDomCoords(x2, y1);
+    xy2 = g.toDomCoords(x2, y2);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+
+    // Test edges of areas (also drawn by dygraphs as lines)
+    xy1 = g.toDomCoords(x1, y1);
+    xy2 = g.toDomCoords(x2, y1);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    xy1 = xy2;
+    xy2 = g.toDomCoords(x2, y2base);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    xy1 = xy2;
+    xy2 = g.toDomCoords(x1, y1base);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    xy1 = xy2;
+    xy2 = g.toDomCoords(x1, y1);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    
+    y1base = y1;
+    y2base = y2;
+    y1 += data[i][3];
+    y2 += data[i + 1][3];
+    
+    // Third series (line)
+    // Test lines
+    xy1 = g.toDomCoords(x1, y1);
+    xy2 = g.toDomCoords(x2, y2);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+
+    // Test edges of areas (also drawn by dygraphs as lines)
+    xy1 = g.toDomCoords(x1, y1);
+    xy2 = g.toDomCoords(x2, y2);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    xy1 = xy2;
+    xy2 = g.toDomCoords(x2, y2base);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    xy1 = xy2;
+    xy2 = g.toDomCoords(x1, y1base);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    xy1 = xy2;
+    xy2 = g.toDomCoords(x1, y1);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    
+    y1base = y1;
+    y2base = y2;
+    y1 += data[i][2];
+    y2 += data[i + 1][2];
+
+    // Second series (step)
+    // Test lines
+    // Horizontal line
+    xy1 = g.toDomCoords(x1, y1);
+    xy2 = g.toDomCoords(x2, y1);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    // Vertical line
+    xy1 = g.toDomCoords(x2, y1);
+    xy2 = g.toDomCoords(x2, y2);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+
+    // Test edges of areas (also drawn by dygraphs as lines)
+    xy1 = g.toDomCoords(x1, y1);
+    xy2 = g.toDomCoords(x2, y1);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    xy1 = xy2;
+    xy2 = g.toDomCoords(x2, y2base);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    xy1 = xy2;
+    xy2 = g.toDomCoords(x1, y1base);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    xy1 = xy2;
+    xy2 = g.toDomCoords(x1, y1);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    
+    y1base = y1;
+    y2base = y2;
+    y1 += data[i][1];
+    y2 += data[i + 1][1];
+
+    // First series (line)
+    // Test lines
+    xy1 = g.toDomCoords(x1, y1);
+    xy2 = g.toDomCoords(x2, y2);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+
+    // Test edges of areas (also drawn by dygraphs as lines)
+    xy1 = g.toDomCoords(x1, y1);
+    xy2 = g.toDomCoords(x2, y2);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    xy1 = xy2;
+    xy2 = g.toDomCoords(x2, y2base);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    xy1 = xy2;
+    xy2 = g.toDomCoords(x1, y1base);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    xy1 = xy2;
+    xy2 = g.toDomCoords(x1, y1);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+  }
+};
+
+stepTestCase.prototype.testMixedModeStepAndLineErrorBars = function() {
+  var opts = {
+    width: 480,
+    height: 320,
+    drawXGrid: false,
+    drawYGrid: false,
+    drawXAxis: false,
+    drawYAxis: false,
+    errorBars: true,
+    sigma: 1,
+    labels: ["X", "Data1", "Data2"],
+    series: {
+      Data1: {stepPlot: true},	
+      Data2: {stepPlot: false} 
+    }
+  };
+  var data = [
+               [1, [75, 2], [50, 3]],
+               [2, [70, 5], [90, 4]],
+               [3, [80, 7], [112, 5]],
+               [4, [55, 3], [100, 2]],
+               [5, [69, 4], [85, 6]]
+             ];
+
+  var graph = document.getElementById("graph");
+  var g = new Dygraph(graph, data, opts);
+
+  htx = g.hidden_ctx_;
+
+  var attrs = {};  
+
+  // Test first series (step)
+  for (var i = 0; i < data.length - 1; i++) {
+    var x1 = data[i][0];
+    var x2 = data[i + 1][0];
+    
+    var y1_middle = data[i][1][0];
+    var y2_middle = data[i + 1][1][0];
+    
+    var y1_top = y1_middle + data[i][1][1];
+    var y2_top = y2_middle + data[i + 1][1][1];
+    
+    var y1_bottom = y1_middle - data[i][1][1];
+    var y2_bottom = y2_middle - data[i + 1][1][1];
+    // Bottom line
+    // Horizontal line
+    var xy1 = g.toDomCoords(x1, y1_bottom);
+    var xy2 = g.toDomCoords(x2, y1_bottom);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    // Vertical line
+    xy1 = g.toDomCoords(x2, y1_bottom);
+    xy2 = g.toDomCoords(x2, y2_bottom);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+
+    // Top line
+    // Horizontal line
+    xy1 = g.toDomCoords(x1, y1_top);
+    xy2 = g.toDomCoords(x2, y1_top);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    // Vertical line
+    xy1 = g.toDomCoords(x2, y1_top);
+    xy2 = g.toDomCoords(x2, y2_top);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+
+    // Middle line
+    // Horizontal line
+    xy1 = g.toDomCoords(x1, y1_middle);
+    xy2 = g.toDomCoords(x2, y1_middle);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    // Vertical line
+    xy1 = g.toDomCoords(x2, y1_middle);
+    xy2 = g.toDomCoords(x2, y2_middle);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+  }
+
+  // Test second series (line)  
+  for (var i = 0; i < data.length - 1; i++) {
+    // bottom line
+    var xy1 = g.toDomCoords(data[i][0], (data[i][2][0] - data[i][2][1]));
+    var xy2 = g.toDomCoords(data[i + 1][0], (data[i + 1][2][0] - data[i + 1][2][1]));
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+
+    // top line
+    xy1 = g.toDomCoords(data[i][0], data[i][2][0] + data[i][2][1]);
+    xy2 = g.toDomCoords(data[i + 1][0], data[i + 1][2][0] + data[i + 1][2][1]);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+
+    // middle line
+    xy1 = g.toDomCoords(data[i][0], data[i][2][0]);
+    xy2 = g.toDomCoords(data[i + 1][0], data[i + 1][2][0]);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+  }
+
+};
+
+stepTestCase.prototype.testMixedModeStepAndLineCustomBars = function() {
+  var opts = {
+    width: 480,
+    height: 320,
+    drawXGrid: false,
+    drawYGrid: false,
+    drawXAxis: false,
+    drawYAxis: false,
+    customBars: true,
+	labels: ["X", "Data1", "Data2"],
+    series: {
+      Data1: {stepPlot: true},	
+      Data2: {stepPlot: false} 
+    }
+  };
+  var data = [
+               [1, [73, 75, 78], [50, 55, 70]],
+               [2, [65, 70, 75], [83, 91, 99]],
+               [3, [75, 85, 90], [98, 107, 117]],
+               [4, [55, 58, 61], [93, 102, 105]],
+               [5, [69, 73, 85], [80, 85, 87]]
+             ];
+
+  var graph = document.getElementById("graph");
+  var g = new Dygraph(graph, data, opts);
+
+  htx = g.hidden_ctx_;
+
+  var attrs = {};  
+
+  // Test first series (step)
+  for (var i = 0; i < data.length - 1; i++) {
+
+    var x1 = data[i][0];
+    var x2 = data[i + 1][0];
+    
+    var y1_middle = data[i][1][1];
+    var y2_middle = data[i + 1][1][1];
+    
+    var y1_top = data[i][1][2];
+    var y2_top = data[i + 1][1][2];
+    
+    var y1_bottom = data[i][1][0];
+    var y2_bottom = data[i + 1][1][0];
+    
+    // Bottom line
+    // Horizontal line
+    var xy1 = g.toDomCoords(x1, y1_bottom);
+    var xy2 = g.toDomCoords(x2, y1_bottom);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    // Vertical line
+    xy1 = g.toDomCoords(x2, y1_middle);
+    xy2 = g.toDomCoords(x2, y2_middle);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    
+    // Top line
+    // Horizontal line
+    xy1 = g.toDomCoords(x1, y1_top);
+    xy2 = g.toDomCoords(x2, y1_top);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    // Vertical line
+    xy1 = g.toDomCoords(x2, y1_middle);
+    xy2 = g.toDomCoords(x2, y2_middle);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    
+    // Middle line
+    // Horizontal line
+    xy1 = g.toDomCoords(x1, y1_middle);
+    xy2 = g.toDomCoords(x2, y1_middle);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    // Vertical line
+    xy1 = g.toDomCoords(x2, y1_middle);
+    xy2 = g.toDomCoords(x2, y2_middle);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+  }
+  
+  // Test second series (line)
+  for (var i = 0; i < data.length - 1; i++) {
+    // Bottom line
+    var xy1 = g.toDomCoords(data[i][0], data[i][2][0]);
+    var xy2 = g.toDomCoords(data[i + 1][0], data[i + 1][2][0]);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+
+    // Top line
+    xy1 = g.toDomCoords(data[i][0], data[i][2][2]);
+    xy2 = g.toDomCoords(data[i + 1][0], data[i + 1][2][2]);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+
+    // Middle line
+    xy1 = g.toDomCoords(data[i][0], data[i][2][1]);
+    xy2 = g.toDomCoords(data[i + 1][0], data[i + 1][2][1]);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+  }
+};

From 5546c2e3de90212cca2b4f6182096f4d3728af82 Mon Sep 17 00:00:00 2001
From: eichsjul <julian.eichstaedt@ch.sauter-bc.com>
Date: Thu, 7 Feb 2013 15:39:02 +0100
Subject: [PATCH 6/7] BUGFIX: Renamed test to capital case, fixed global var
 stuff, renamed file to lower case

---
 auto_tests/misc/local.html                    |  2 +-
 ..._per_series.js => step_plot_per_series.js} | 23 ++++++++++---------
 2 files changed, 13 insertions(+), 12 deletions(-)
 rename auto_tests/tests/{stepPlot_per_series.js => step_plot_per_series.js} (95%)

diff --git a/auto_tests/misc/local.html b/auto_tests/misc/local.html
index d12645391..74f57e618 100644
--- a/auto_tests/misc/local.html
+++ b/auto_tests/misc/local.html
@@ -47,7 +47,7 @@
   <script type="text/javascript" src="../tests/scrolling_div.js"></script>
   <script type="text/javascript" src="../tests/selection.js"></script>
   <script type="text/javascript" src="../tests/simple_drawing.js"></script>
-  <script type="text/javascript" src="../tests/stepPlot_per_series.js"></script>
+  <script type="text/javascript" src="../tests/step_plot_per_series.js"></script>
   <script type="text/javascript" src="../tests/stacked.js"></script>
   <!--
   <script type="text/javascript" src="../tests/tickers.js"></script>
diff --git a/auto_tests/tests/stepPlot_per_series.js b/auto_tests/tests/step_plot_per_series.js
similarity index 95%
rename from auto_tests/tests/stepPlot_per_series.js
rename to auto_tests/tests/step_plot_per_series.js
index 302a6cb42..7a6d96d71 100644
--- a/auto_tests/tests/stepPlot_per_series.js
+++ b/auto_tests/tests/step_plot_per_series.js
@@ -3,25 +3,26 @@
  *
  * @author julian.eichstaedt@ch.sauter-bc.com (Fr. Sauter AG)
  */
-var stepTestCase = TestCase("stepPlot_per_series");
+var StepTestCase = TestCase("step_plot_per_series");
 
-stepTestCase.prototype.setUp = function() {
+StepTestCase.prototype.setUp = function() {
   document.body.innerHTML = "<div id='graph'></div>";
 };
 
-var _origFunc = Dygraph.getContext;
-stepTestCase.prototype.setUp = function() {
+StepTestCase.origFunc = Dygraph.getContext;
+
+StepTestCase.prototype.setUp = function() {
   document.body.innerHTML = "<div id='graph'></div>";
   Dygraph.getContext = function(canvas) {
-    return new Proxy(_origFunc(canvas));
+    return new Proxy(StepTestCase.origFunc(canvas));
   };
 };
 
-stepTestCase.prototype.tearDown = function() {
-  Dygraph.getContext = _origFunc;
+StepTestCase.prototype.tearDown = function() {
+  Dygraph.getContext = StepTestCase.origFunc;
 };
 
-stepTestCase.prototype.testMixedModeStepAndLineFilled = function() {
+StepTestCase.prototype.testMixedModeStepAndLineFilled = function() {
   var opts = {
     width: 480,
     height: 320,
@@ -84,7 +85,7 @@ stepTestCase.prototype.testMixedModeStepAndLineFilled = function() {
   }
 };
 
-stepTestCase.prototype.testMixedModeStepAndLineStackedAndFilled = function() {
+StepTestCase.prototype.testMixedModeStepAndLineStackedAndFilled = function() {
   var opts = {
     width: 480,
     height: 320,
@@ -238,7 +239,7 @@ stepTestCase.prototype.testMixedModeStepAndLineStackedAndFilled = function() {
   }
 };
 
-stepTestCase.prototype.testMixedModeStepAndLineErrorBars = function() {
+StepTestCase.prototype.testMixedModeStepAndLineErrorBars = function() {
   var opts = {
     width: 480,
     height: 320,
@@ -333,7 +334,7 @@ stepTestCase.prototype.testMixedModeStepAndLineErrorBars = function() {
 
 };
 
-stepTestCase.prototype.testMixedModeStepAndLineCustomBars = function() {
+StepTestCase.prototype.testMixedModeStepAndLineCustomBars = function() {
   var opts = {
     width: 480,
     height: 320,

From 1654747cd4d23f4e393705de6ad118c37d55efb7 Mon Sep 17 00:00:00 2001
From: eichsjul <julian.eichstaedt@ch.sauter-bc.com>
Date: Thu, 7 Feb 2013 16:59:30 +0100
Subject: [PATCH 7/7] BUGFIX:

Corrected tests for stepPlot per series
---
 auto_tests/tests/step_plot_per_series.js | 77 +++++++++++-------------
 1 file changed, 34 insertions(+), 43 deletions(-)

diff --git a/auto_tests/tests/step_plot_per_series.js b/auto_tests/tests/step_plot_per_series.js
index 7a6d96d71..bf2594856 100644
--- a/auto_tests/tests/step_plot_per_series.js
+++ b/auto_tests/tests/step_plot_per_series.js
@@ -131,7 +131,6 @@ StepTestCase.prototype.testMixedModeStepAndLineStackedAndFilled = function() {
     var y1 = data[i][4];
     var y2 = data[i + 1][4];
 
-
     // Fourth series (step)
     // Test lines
     // Horizontal line
@@ -153,12 +152,11 @@ StepTestCase.prototype.testMixedModeStepAndLineStackedAndFilled = function() {
     xy1 = xy2;
     xy2 = g.toDomCoords(x1, y1base);
     CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
-    xy1 = xy2;
-    xy2 = g.toDomCoords(x1, y1);
-    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    // The last edge can not be tested via assertLineDrawn since it wasn't drawn as a line but via clossePath.
+    // But a rectangle is completely tested with three of its four edges.
     
     y1base = y1;
-    y2base = y2;
+    y2base = y1;
     y1 += data[i][3];
     y2 += data[i + 1][3];
     
@@ -178,9 +176,8 @@ StepTestCase.prototype.testMixedModeStepAndLineStackedAndFilled = function() {
     xy1 = xy2;
     xy2 = g.toDomCoords(x1, y1base);
     CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
-    xy1 = xy2;
-    xy2 = g.toDomCoords(x1, y1);
-    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    // The last edge can not be tested via assertLineDrawn since it wasn't drawn as a line but via clossePath.
+    // But a rectangle is completely tested with three of its four edges.
     
     y1base = y1;
     y2base = y2;
@@ -208,12 +205,11 @@ StepTestCase.prototype.testMixedModeStepAndLineStackedAndFilled = function() {
     xy1 = xy2;
     xy2 = g.toDomCoords(x1, y1base);
     CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
-    xy1 = xy2;
-    xy2 = g.toDomCoords(x1, y1);
-    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    // The last edge can not be tested via assertLineDrawn since it wasn't drawn as a line but via clossePath.
+    // But a rectangle is completely tested with three of its four edges.
     
     y1base = y1;
-    y2base = y2;
+    y2base = y1;
     y1 += data[i][1];
     y2 += data[i + 1][1];
 
@@ -233,9 +229,8 @@ StepTestCase.prototype.testMixedModeStepAndLineStackedAndFilled = function() {
     xy1 = xy2;
     xy2 = g.toDomCoords(x1, y1base);
     CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
-    xy1 = xy2;
-    xy2 = g.toDomCoords(x1, y1);
-    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    // The last edge can not be tested via assertLineDrawn since it wasn't drawn as a line but via clossePath.
+    // But a rectangle is completely tested with three of its four edges.
   }
 };
 
@@ -284,34 +279,32 @@ StepTestCase.prototype.testMixedModeStepAndLineErrorBars = function() {
     var y1_bottom = y1_middle - data[i][1][1];
     var y2_bottom = y2_middle - data[i + 1][1][1];
     // Bottom line
-    // Horizontal line
     var xy1 = g.toDomCoords(x1, y1_bottom);
     var xy2 = g.toDomCoords(x2, y1_bottom);
     CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
-    // Vertical line
-    xy1 = g.toDomCoords(x2, y1_bottom);
-    xy2 = g.toDomCoords(x2, y2_bottom);
-    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
 
     // Top line
-    // Horizontal line
     xy1 = g.toDomCoords(x1, y1_top);
     xy2 = g.toDomCoords(x2, y1_top);
     CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
-    // Vertical line
-    xy1 = g.toDomCoords(x2, y1_top);
-    xy2 = g.toDomCoords(x2, y2_top);
-    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
 
     // Middle line
-    // Horizontal line
     xy1 = g.toDomCoords(x1, y1_middle);
     xy2 = g.toDomCoords(x2, y1_middle);
     CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
-    // Vertical line
-    xy1 = g.toDomCoords(x2, y1_middle);
-    xy2 = g.toDomCoords(x2, y2_middle);
+    
+    // Test edges of error bar areas(also drawn by dygraphs as lines)
+    xy1 = g.toDomCoords(x1, y1_top);
+    xy2 = g.toDomCoords(x2, y1_top);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    xy1 = xy2;
+    xy2 = g.toDomCoords(x2, y1_bottom);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    xy1 = xy2;
+    xy2 = g.toDomCoords(x1, y1_bottom);
     CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    // The last edge can not be tested via assertLineDrawn since it wasn't drawn as a line but via clossePath.
+    // But a rectangle is completely tested with three of its four edges.
   }
 
   // Test second series (line)  
@@ -380,34 +373,32 @@ StepTestCase.prototype.testMixedModeStepAndLineCustomBars = function() {
     var y2_bottom = data[i + 1][1][0];
     
     // Bottom line
-    // Horizontal line
     var xy1 = g.toDomCoords(x1, y1_bottom);
     var xy2 = g.toDomCoords(x2, y1_bottom);
     CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
-    // Vertical line
-    xy1 = g.toDomCoords(x2, y1_middle);
-    xy2 = g.toDomCoords(x2, y2_middle);
-    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
     
     // Top line
-    // Horizontal line
     xy1 = g.toDomCoords(x1, y1_top);
     xy2 = g.toDomCoords(x2, y1_top);
     CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
-    // Vertical line
-    xy1 = g.toDomCoords(x2, y1_middle);
-    xy2 = g.toDomCoords(x2, y2_middle);
-    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
     
     // Middle line
-    // Horizontal line
     xy1 = g.toDomCoords(x1, y1_middle);
     xy2 = g.toDomCoords(x2, y1_middle);
     CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
-    // Vertical line
-    xy1 = g.toDomCoords(x2, y1_middle);
-    xy2 = g.toDomCoords(x2, y2_middle);
+    
+    // Test edges of custom bar areas(also drawn by dygraphs as lines)
+    xy1 = g.toDomCoords(x1, y1_top);
+    xy2 = g.toDomCoords(x2, y1_top);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    xy1 = xy2;
+    xy2 = g.toDomCoords(x2, y1_bottom);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    xy1 = xy2;
+    xy2 = g.toDomCoords(x1, y1_bottom);
     CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    // The last edge can not be tested via assertLineDrawn since it wasn't drawn as a line but via clossePath.
+    // But a rectangle is completely tested with three of its four edges.
   }
   
   // Test second series (line)