From 2e513c99aaad6f35286433101ef120a291f253a4 Mon Sep 17 00:00:00 2001
From: Julien Bouyoud <jul86bouyd@gmail.com>
Date: Sat, 16 Nov 2013 08:38:26 +0100
Subject: [PATCH]  Patch for Issue 707 and 778

- Fixes the issue where steps altering user datapoints
- Do not altering user data points for drawing lines with steps
(even stacked); just consider drawing with steps enables a different
kind of plotting and clipping on lines and areas; that assuming that
drawing with steps must always go horizontally and then verticaly
(like previous inserted datapoints).
---
 examples/series-types/index.html |  6 ++-
 jquery.flot.fillbetween.js       | 13 ------
 jquery.flot.js                   | 72 ++++++++++++++++----------------
 jquery.flot.stack.js             | 12 ------
 4 files changed, 39 insertions(+), 64 deletions(-)

diff --git a/examples/series-types/index.html b/examples/series-types/index.html
index f26debb..4398763 100644
--- a/examples/series-types/index.html
+++ b/examples/series-types/index.html
@@ -6,7 +6,8 @@
 	<link href="../examples.css" rel="stylesheet" type="text/css">
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
+    <script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
 	<script type="text/javascript">
 
 	$(function() {
@@ -56,7 +57,8 @@
 			points: { show: true }
 		}, {
 			data: d6,
-			lines: { show: true, steps: true }
+			lines: { show: true, steps: true },
+			points: { show: true }
 		}]);
 
 		// Add the Flot version string to the footer
diff --git a/jquery.flot.fillbetween.js b/jquery.flot.fillbetween.js
index e1dd143..0142707 100644
--- a/jquery.flot.fillbetween.js
+++ b/jquery.flot.fillbetween.js
@@ -79,7 +79,6 @@ jquery.flot.stack.js plugin, possibly some code could be shared.
                 px, py, intery, qx, qy, bottom,
                 withlines = s.lines.show,
                 withbottom = ps > 2 && datapoints.format[2].y,
-                withsteps = withlines && s.lines.steps,
                 fromgap = true,
                 i = 0,
                 j = 0,
@@ -196,18 +195,6 @@ jquery.flot.stack.js plugin, possibly some code could be shared.
                         newpoints[l + 2] = bottom;
                     }
                 }
-
-                // maintain the line steps invariant
-
-                if (withsteps && l !== newpoints.length && l > 0 &&
-                    newpoints[l] !== null &&
-                    newpoints[l] !== newpoints[ l - ps ] &&
-                    newpoints[l + 1] !== newpoints[l - ps + 1] ) {
-                    for (m = 0; m < ps; ++m) {
-                        newpoints[l + ps + m] = newpoints[l + m];
-                    }
-                    newpoints[l + 1] = newpoints[l - ps + 1];
-                }
             }
 
             datapoints.points = newpoints;
diff --git a/jquery.flot.js b/jquery.flot.js
index 96800e2..3415658 100644
--- a/jquery.flot.js
+++ b/jquery.flot.js
@@ -1271,8 +1271,7 @@ Licensed under the MIT license.
 
                 ps = s.datapoints.pointsize;
                 points = s.datapoints.points;
-
-                var insertSteps = s.lines.show && s.lines.steps;
+                
                 s.xaxis.used = s.yaxis.used = true;
 
                 for (j = k = 0; j < data.length; ++j, k += ps) {
@@ -1328,25 +1327,6 @@ Licensed under the MIT license.
                             }
                             points[k + m] = null;
                         }
-                    } else {
-                        // a little bit of line specific stuff that
-                        // perhaps shouldn't be here, but lacking
-                        // better means...
-                        if (insertSteps && k > 0 &&
-                            points[k - ps] != null &&
-                            points[k - ps] !== points[k] &&
-                            points[k - ps + 1] !== points[k + 1]) {
-                            // copy the point to make room for a middle point
-                            for (m = 0; m < ps; ++m) {
-                                points[k + ps + m] = points[k + m];
-                            }
-
-                            // middle point has same y
-                            points[k + 1] = points[k - ps + 1];
-
-                            // we've added a point, better reflect that
-                            k += ps;
-                        }
                     }
                 }
             }
@@ -2426,6 +2406,7 @@ Licensed under the MIT license.
             function plotLine(datapoints, xoffset, yoffset, axisx, axisy) {
                 var points = datapoints.points,
                     ps = datapoints.pointsize,
+                    showSteps = series.lines.steps,
                     prevx = null, prevy = null;
 
                 ctx.beginPath();
@@ -2443,13 +2424,13 @@ Licensed under the MIT license.
                             continue;   // line segment is outside
                         }
                         // compute new intersection point
-                        x1 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
+                        x1 = showSteps ? x2 : (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
                         y1 = axisy.min;
                     } else if (y2 <= y1 && y2 < axisy.min) {
                         if (y1 < axisy.min) {
                             continue;
                         }
-                        x2 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
+                        x2 = showSteps ? x2 : (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
                         y2 = axisy.min;
                     }
 
@@ -2458,13 +2439,13 @@ Licensed under the MIT license.
                         if (y2 > axisy.max) {
                             continue;
                         }
-                        x1 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
+                        x1 = showSteps ? x2 : (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
                         y1 = axisy.max;
                     } else if (y2 >= y1 && y2 > axisy.max) {
                         if (y1 > axisy.max) {
                             continue;
                         }
-                        x2 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
+                        x2 = showSteps ? x2 : (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
                         y2 = axisy.max;
                     }
 
@@ -2473,13 +2454,13 @@ Licensed under the MIT license.
                         if (x2 < axisx.min) {
                             continue;
                         }
-                        y1 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1;
+                        y1 = showSteps ? y1 : (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1;
                         x1 = axisx.min;
                     } else if (x2 <= x1 && x2 < axisx.min) {
                         if (x1 < axisx.min) {
                             continue;
                         }
-                        y2 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1;
+                        y2 = showSteps ? y1 : (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1;
                         x2 = axisx.min;
                     }
 
@@ -2488,13 +2469,13 @@ Licensed under the MIT license.
                         if (x2 > axisx.max) {
                             continue;
                         }
-                        y1 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
+                        y1 = showSteps ? y1 : (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
                         x1 = axisx.max;
                     } else if (x2 >= x1 && x2 > axisx.max) {
                         if (x1 > axisx.max) {
                             continue;
                         }
-                        y2 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
+                        y2 = showSteps ? y1 : (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
                         x2 = axisx.max;
                     }
 
@@ -2504,6 +2485,14 @@ Licensed under the MIT license.
 
                     prevx = x2;
                     prevy = y2;
+                    // Draw a step
+                    if (showSteps) {
+                        if (x1 < x2) {
+                            ctx.lineTo(axisx.p2c(x2) + xoffset, axisy.p2c(y1) + yoffset);
+                        } else {
+                            ctx.lineTo(axisx.p2c(x1) + xoffset, axisy.p2c(y2) + yoffset);
+                        }
+                    }
                     ctx.lineTo(axisx.p2c(x2) + xoffset, axisy.p2c(y2) + yoffset);
                 }
                 ctx.stroke();
@@ -2512,6 +2501,7 @@ Licensed under the MIT license.
             function plotLineArea(datapoints, axisx, axisy) {
                 var points = datapoints.points,
                     ps = datapoints.pointsize,
+                    showSteps = series.lines.steps,
                     bottom = Math.min(Math.max(0, axisy.min), axisy.max),
                     i = 0, areaOpen = false,
                     ypos = 1, segmentStart = 0, segmentEnd = 0;
@@ -2561,13 +2551,13 @@ Licensed under the MIT license.
                         if (x2 < axisx.min) {
                             continue;
                         }
-                        y1 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1;
+                        y1 = showSteps ? y1 : (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1;
                         x1 = axisx.min;
                     } else if (x2 <= x1 && x2 < axisx.min) {
                         if (x1 < axisx.min) {
                             continue;
                         }
-                        y2 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1;
+                        y2 = showSteps ? y1 : (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1;
                         x2 = axisx.min;
                     }
 
@@ -2576,13 +2566,13 @@ Licensed under the MIT license.
                         if (x2 > axisx.max) {
                             continue;
                         }
-                        y1 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
+                        y1 = showSteps ? y1 : (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
                         x1 = axisx.max;
                     } else if (x2 >= x1 && x2 > axisx.max) {
                         if (x1 > axisx.max) {
                             continue;
                         }
-                        y2 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
+                        y2 = showSteps ? y1 : (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
                         x2 = axisx.max;
                     }
 
@@ -2615,19 +2605,19 @@ Licensed under the MIT license.
 
                     // clip with ymin
                     if (y1 <= y2 && y1 < axisy.min && y2 >= axisy.min) {
-                        x1 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
+                        x1 = showSteps ? x2 : (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
                         y1 = axisy.min;
                     } else if (y2 <= y1 && y2 < axisy.min && y1 >= axisy.min) {
-                        x2 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
+                        x2 = showSteps ? x2 : (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
                         y2 = axisy.min;
                     }
 
                     // clip with ymax
                     if (y1 >= y2 && y1 > axisy.max && y2 <= axisy.max) {
-                        x1 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
+                        x1 = showSteps ? x2 : (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
                         y1 = axisy.max;
                     } else if (y2 >= y1 && y2 > axisy.max && y1 <= axisy.max) {
-                        x2 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
+                        x2 = showSteps ? x2 : (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
                         y2 = axisy.max;
                     }
 
@@ -2642,6 +2632,14 @@ Licensed under the MIT license.
                     // in redundant points if (x1, y1) hasn't changed
                     // from previous line to, but we just ignore that
                     ctx.lineTo(axisx.p2c(x1), axisy.p2c(y1));
+                    // Draw a step
+                    if (showSteps) {
+                        if (x1 < x2) {
+                            ctx.lineTo(axisx.p2c(x2), axisy.p2c(y1));
+                        } else {
+                            ctx.lineTo(axisx.p2c(x1), axisy.p2c(y2));
+                        }
+                    }
                     ctx.lineTo(axisx.p2c(x2), axisy.p2c(y2));
 
                     // fill the other rectangle if it's there
diff --git a/jquery.flot.stack.js b/jquery.flot.stack.js
index c0ccccf..55bd3b3 100644
--- a/jquery.flot.stack.js
+++ b/jquery.flot.stack.js
@@ -75,7 +75,6 @@ charts or filled areas).
                 withlines = s.lines.show,
                 horizontal = s.bars.horizontal,
                 withbottom = ps > 2 && (horizontal ? datapoints.format[2].x : datapoints.format[2].y),
-                withsteps = withlines && s.lines.steps,
                 fromgap = true,
                 keyOffset = horizontal ? 1 : 0,
                 accumulateOffset = horizontal ? 0 : 1,
@@ -169,17 +168,6 @@ charts or filled areas).
                         newpoints[l + 2] += bottom;
                     }
                 }
-
-                // maintain the line steps invariant
-                if (withsteps && l !== newpoints.length && l > 0 &&
-                    newpoints[l] != null &&
-                    newpoints[l] !== newpoints[l - ps] &&
-                    newpoints[l + 1] !== newpoints[l - ps + 1]) {
-                    for (m = 0; m < ps; ++m) {
-                        newpoints[l + ps + m] = newpoints[l + m];
-                    }
-                    newpoints[l + 1] = newpoints[l - ps + 1];
-                }
             }
 
             datapoints.points = newpoints;