fixing ohlc showing wrong color when open equals close

Author: noway

src/traces/candlestick/transform.js

@@ -114,10 +114,16 @@ exports.calcTransform = function calcTransform(gd, trace, opts) {
         y.push(l, o, c, c, c, h);
     };
 
+    var isPrevThisDirection = null;
+
     for(var i = 0; i < len; i++) {
-        if(filterFn(open[i], close[i])) {
+        if(filterFn(open[i], close[i], isPrevThisDirection, open[i - 1], close[i - 1])) {
             appendX(i);
             appendY(open[i], high[i], low[i], close[i]);
+            isPrevThisDirection = true;
+        } else {
+            isPrevThisDirection = false;
+            // not adding this candle to this direction bunch
         }
     }
 

src/traces/ohlc/helpers.js

@@ -97,13 +97,46 @@ exports.makeTransform = function(traceIn, state, direction) {
 exports.getFilterFn = function(direction) {
     switch(direction) {
         case 'increasing':
-            return function(o, c) { return o <= c; };
+            return function(o, c, isPrevThisDirection, oprev, cprev) {
+                if (o == c) { 
+                    if (c > cprev) {
+                        return true // increasing
+                    } else if (c < cprev) {
+                        return false // decreasing
+                    } else {
+                        if (isPrevThisDirection === true) {
+                            return true // determine by last candle
+                        } else if (isPrevThisDirection == false) {
+                            return false // determine by last candle
+                        } else {
+                            return true // If we don't have previous data, assume it was increasing
+                        }
+                    }
+                }
+                return o < c; 
+            };
 
         case 'decreasing':
-            return function(o, c) { return o > c; };
+            return function(o, c, isPrevThisDirection, oprev, cprev) { 
+                if (o == c) { 
+                    if (c > cprev) {
+                        return false // increasing
+                    } else if (c < cprev) {
+                        return true // decreasing
+                    } else {
+                        if (isPrevThisDirection === true) {
+                            return true // determine by last candle
+                        } else if (isPrevThisDirection == false) {
+                            return false // determine by last candle
+                        } else {
+                            return false // If we don't have previous data, assume it was increasing
+                        }
+                    }
+                }
+                return o > c; 
+            };
     }
 };
-
 exports.addRangeSlider = function(data, layout) {
     var hasOneVisibleTrace = false;
 

src/traces/ohlc/transform.js

@@ -194,11 +194,16 @@ exports.calcTransform = function calcTransform(gd, trace, opts) {
         textOut.push(_t, _t, _t, _t, _t, _t, null);
     };
 
+    var isPrevThisDirection = null;
     for(var i = 0; i < len; i++) {
-        if(filterFn(open[i], close[i])) {
+        if(filterFn(open[i], close[i], isPrevThisDirection, open[i - 1], close[i - 1])) {
             appendX(i);
             appendY(open[i], high[i], low[i], close[i]);
             appendText(i, open[i], high[i], low[i], close[i]);
+            isPrevThisDirection = true;
+        } else {
+            isPrevThisDirection = false;
+            // not adding this candle to this direction bunch
         }
     }