fix nonlinear axes in select

plotly · Jan 6, 2016 · 710791d · 710791d · etpinard · Jan 6, 2016
1 parent bc04a15
commit 710791d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/plots/cartesian/axes.js b/src/plots/cartesian/axes.js
@@ -634,7 +634,7 @@ axes.setConvert = function(ax) {
     ax.c2l = (ax.type==='log') ? toLog : num;
     ax.l2c = (ax.type==='log') ? fromLog : num;
     ax.l2d = function(v) { return ax.c2d(ax.l2c(v)); };
-    ax.p2d = function(v) { return ax.p2l(ax.l2d(v)); };
+    ax.p2d = function(v) { return ax.l2d(ax.p2l(v)); };
 
     // set scaling to pixels
     ax.setScale = function(){

diff --git a/src/plots/cartesian/select.js b/src/plots/cartesian/select.js
@@ -86,6 +86,8 @@ module.exports = function prepSelect(e, startX, startY, dragOptions, mode) {
         return function(v) { return ax.p2d(v[index]); };
     }
 
+    function ascending(a, b){ return a - b; }
+
     dragOptions.moveFn = function(dx0, dy0) {
         var poly,
             ax;
@@ -146,7 +148,7 @@ module.exports = function prepSelect(e, startX, startY, dragOptions, mode) {
                 axLetter = ax._id.charAt(0);
                 ranges[ax._id] = [
                     ax.p2d(poly[axLetter + 'min']),
-                    ax.p2d(poly[axLetter + 'max'])].sort();
+                    ax.p2d(poly[axLetter + 'max'])].sort(ascending);
             }
         }
         else {