Add setPointGroupScale tests

Author: rreusser

src/lib/index.js

@@ -484,22 +484,30 @@ lib.setScale = function(element, x, y) {
     return transform;
 };
 
-lib.setPointScale = function(selection, x, y) {
+lib.setPointGroupScale = function(selection, x, y) {
+    var t, scale, re;
+
     x = x || 1;
     y = y || 1;
 
-    // The same scale transform for every point:
-    var scale = ' scale(' + x + ',' + y + ')';
+    if(x === 1 && y === 1) {
+        scale = '';
+    } else {
+        // The same scale transform for every point:
+        scale = ' scale(' + x + ',' + y + ')';
+    }
 
     // A regex to strip any existing scale:
-    var re = /sc.*/;
+    re = /\s*sc.*/;
 
     selection.each(function() {
         // Get the transform:
-        var t = this.getAttribute('transform').replace(re, '');
+        t = (this.getAttribute('transform') || '').replace(re, '');
+        t += scale;
+        t = t.trim();
 
         // Append the scale transform
-        this.setAttribute('transform', t + scale);
+        this.setAttribute('transform', t);
     });
 
     return scale;

src/plots/cartesian/dragbox.js

@@ -634,9 +634,12 @@ module.exports = function dragBox(gd, plotinfo, x, y, w, h, ns, ew) {
             subplot.plot
                 .call(Lib.setTranslate, plotDx, plotDy)
                 .call(Lib.setScale, xScaleFactor, yScaleFactor)
-                .selectAll('.points').selectAll('.point')
-                    .call(Lib.setPointScale, 1 / xScaleFactor, 1 / yScaleFactor);
 
+                // This is specifically directed at scatter traces, applying an inverse
+                // scale to individual points to counteract the scale of the trace
+                // as a whole:
+                .selectAll('.points').selectAll('.point')
+                    .call(Lib.setPointGroupScale, 1 / xScaleFactor, 1 / yScaleFactor);
         }
     }
 

test/jasmine/tests/lib_test.js

@@ -1202,6 +1202,44 @@ describe('Test lib.js:', function() {
         });
     });
 
+    describe('setPointGroupScale', function() {
+        var el, sel;
+
+        beforeEach(function() {
+            el = document.createElement('div');
+            sel = d3.select(el);
+        });
+
+        it('sets the scale of a point', function() {
+            Lib.setPointGroupScale(sel, 2, 2);
+            expect(el.getAttribute('transform')).toBe('scale(2,2)');
+        });
+
+        it('appends the scale of a point', function() {
+            el.setAttribute('transform', 'translate(1,2)');
+            Lib.setPointGroupScale(sel, 2, 2);
+            expect(el.getAttribute('transform')).toBe('translate(1,2) scale(2,2)');
+        });
+
+        it('modifies the scale of a point', function() {
+            el.setAttribute('transform', 'translate(1,2) scale(3,4)');
+            Lib.setPointGroupScale(sel, 2, 2);
+            expect(el.getAttribute('transform')).toBe('translate(1,2) scale(2,2)');
+        });
+
+        it('does not apply the scale of a point if scale (1, 1)', function() {
+            el.setAttribute('transform', 'translate(1,2)');
+            Lib.setPointGroupScale(sel, 1, 1);
+            expect(el.getAttribute('transform')).toBe('translate(1,2)');
+        });
+
+        it('removes the scale of a point if scale (1, 1)', function() {
+            el.setAttribute('transform', 'translate(1,2) scale(3,4)');
+            Lib.setPointGroupScale(sel, 1, 1);
+            expect(el.getAttribute('transform')).toBe('translate(1,2)');
+        });
+    });
+
     describe('pushUnique', function() {
 
         beforeEach(function() {