Merge pull request plotly#441 from plotly/rangeslider-datafix

mdtusz · mdtusz · commit 440f8155042c · 2016-04-19T10:36:10.000-04:00
Rangeslider data conversion upgrade
diff --git a/src/components/rangeslider/data_processors.js b/src/components/rangeslider/data_processors.js
diff --git a/src/components/rangeslider/range_plot.js b/src/components/rangeslider/range_plot.js
@@ -12,7 +12,6 @@ var Symbols = require('../drawing/symbol_defs');
 var Drawing = require('../drawing');
 
 var helpers = require('./helpers');
-var dataProcessors = require('./data_processors');
 var svgNS = require('../../constants/xmlns_namespaces').svg;
 
 module.exports = function rangePlot(gd, w, h) {
@@ -42,10 +41,6 @@ module.exports = function rangePlot(gd, w, h) {
     rangePlot.appendChild(clipDefs);
 
 
-    var processX = dataProcessors[gd._fullLayout.xaxis.type || 'category'],
-        processY = dataProcessors[gd._fullLayout.yaxis.type || 'category'];
-
-
     // for now, only scatter traces are supported
     var allowedTypes = ['scatter'];
 
@@ -59,12 +54,13 @@ module.exports = function rangePlot(gd, w, h) {
             continue;
         }
 
-        for(var k = 0; k < trace.x.length; k++) {
-            var x = processX(trace.x[k], k),
-                y = processY(trace.y[k], k);
+        var x = makeLinearData(trace, xaxis),
+            y = makeLinearData(trace, yaxis);
 
-            var posX = w * (x - minX) / (maxX - minX),
-                posY = h * (1 - (y - minY) / (maxY - minY));
+        for(var k = 0; k < x.length; k++) {
+
+            var posX = w * (x[k] - minX) / (maxX - minX),
+                posY = h * (1 - (y[k] - minY) / (maxY - minY));
 
             pointPairs.push([posX, posY]);
         }
@@ -77,6 +73,16 @@ module.exports = function rangePlot(gd, w, h) {
     return rangePlot;
 };
 
+function makeLinearData(trace, axis) {
+    var data = axis.makeCalcdata(trace || [], axis._id[0]);
+
+    for(var i = 0; i < data.length; i++) {
+        data[i] = axis.c2l(data[i]);
+    }
+
+    return data;
+}
+
 
 function makeScatter(trace, pointPairs, w, h) {
 
diff --git a/test/jasmine/tests/range_slider_test.js b/test/jasmine/tests/range_slider_test.js
@@ -308,6 +308,35 @@ describe('the range slider', function() {
             expect(layoutOut).toEqual(expected);
         });
     });
+
+    describe('in general', function() {
+
+        beforeEach(function() {
+            gd = createGraphDiv();
+        });
+
+        afterEach(destroyGraphDiv);
+
+        it('should plot when only x data is provided', function(done) {
+            Plotly.plot(gd, [{ x: [1,2,3] }], { xaxis: { rangeslider: {} }})
+                .then(function() {
+                    var rangeslider = document.getElementsByClassName('range-slider');
+
+                    expect(rangeslider.length).toBe(1);
+                })
+                .then(done);
+        });
+
+        it('should plot when only y data is provided', function(done) {
+            Plotly.plot(gd, [{ y: [1,2,3] }], { xaxis: { rangeslider: {} }})
+                .then(function() {
+                    var rangeslider = document.getElementsByClassName('range-slider');
+
+                    expect(rangeslider.length).toBe(1);
+                })
+                .then(done);
+        });
+    });
 });
 
 
