Merge branch 'master' into issue-1976

Author: etpinard

package-lock.json

@@ -68,7 +68,7 @@
     "d3-force": "^1.0.6",
     "delaunay-triangulate": "^1.1.6",
     "es6-promise": "^3.0.2",
-    "fast-isnumeric": "^1.1.1",
+    "fast-isnumeric": "^1.1.2",
     "font-atlas-sdf": "^1.3.3",
     "gl-cone3d": "^1.2.0",
     "gl-contour2d": "^1.1.4",
@@ -80,7 +80,7 @@
     "gl-plot2d": "^1.3.1",
     "gl-plot3d": "^1.5.10",
     "gl-pointcloud2d": "^1.0.1",
-    "gl-scatter3d": "^1.0.12",
+    "gl-scatter3d": "^1.0.13",
     "gl-select-box": "^1.0.2",
     "gl-spikes2d": "^1.0.1",
     "gl-streamtube3d": "^1.1.0",

package.json

@@ -356,7 +356,7 @@ function applyAttributes(sieve) {
 
         if(isArrayOrTypedArray(offset)) {
             // if offset is an array, then clone it into t.poffset.
-            newPoffset = offset.slice(0, calcTrace.length);
+            newPoffset = Array.prototype.slice.call(offset, 0, calcTrace.length);
 
             // guard against non-numeric items
             for(j = 0; j < newPoffset.length; j++) {
@@ -377,12 +377,12 @@ function applyAttributes(sieve) {
             t.poffset = offset;
         }
 
-        var width = fullTrace._width || fullTrace.width,
-            initialBarwidth = t.barwidth;
+        var width = fullTrace._width || fullTrace.width;
+        var initialBarwidth = t.barwidth;
 
         if(isArrayOrTypedArray(width)) {
             // if width is an array, then clone it into t.barwidth.
-            var newBarwidth = width.slice(0, calcTrace.length);
+            var newBarwidth = Array.prototype.slice.call(width, 0, calcTrace.length);
 
             // guard against non-numeric items
             for(j = 0; j < newBarwidth.length; j++) {

src/traces/bar/cross_trace_calc.js

@@ -18,6 +18,25 @@ var extendFlat = require('../../lib/extend').extendFlat;
 var scatterMarkerAttrs = scatterAttrs.marker;
 var scatterMarkerLineAttrs = scatterMarkerAttrs.line;
 
+var markerLineAttrs = extendFlat(colorAttrs('marker.line', {editTypeOverride: 'calc'}), {
+    width: extendFlat({}, scatterMarkerLineAttrs.width, {editType: 'calc'}),
+    editType: 'calc'
+});
+
+var markerAttrs = extendFlat(colorAttrs('marker'), {
+    symbol: scatterMarkerAttrs.symbol,
+    size: extendFlat({}, scatterMarkerAttrs.size, {editType: 'markerSize'}),
+    sizeref: scatterMarkerAttrs.sizeref,
+    sizemin: scatterMarkerAttrs.sizemin,
+    sizemode: scatterMarkerAttrs.sizemode,
+    opacity: scatterMarkerAttrs.opacity,
+    colorbar: scatterMarkerAttrs.colorbar,
+    line: markerLineAttrs,
+    editType: 'calc'
+});
+
+markerAttrs.color.editType = markerAttrs.cmin.editType = markerAttrs.cmax.editType = 'style';
+
 function makeAxesValObject(axLetter) {
     return {
         valType: 'info_array',
@@ -105,20 +124,7 @@ module.exports = {
         ].join(' ')
     }),
 
-    marker: extendFlat({}, colorAttrs('marker'), {
-        symbol: scatterMarkerAttrs.symbol,
-        size: extendFlat({}, scatterMarkerAttrs.size, {editType: 'markerSize'}),
-        sizeref: scatterMarkerAttrs.sizeref,
-        sizemin: scatterMarkerAttrs.sizemin,
-        sizemode: scatterMarkerAttrs.sizemode,
-        opacity: scatterMarkerAttrs.opacity,
-        colorbar: scatterMarkerAttrs.colorbar,
-        line: extendFlat({}, colorAttrs('marker.line'), {
-            width: scatterMarkerLineAttrs.width,
-            editType: 'calc'
-        }),
-        editType: 'calc'
-    }),
+    marker: markerAttrs,
 
     xaxes: makeAxesValObject('x'),
     yaxes: makeAxesValObject('y'),

src/traces/splom/attributes.js

@@ -309,15 +309,17 @@ function editStyle(gd, cd0) {
     var trace = cd0.trace;
     var scene = gd._fullLayout._splomScenes[trace.uid];
 
-    calcColorscales(trace);
+    if(scene) {
+        calcColorscales(trace);
 
-    Lib.extendFlat(scene.matrixOptions, convertMarkerStyle(trace));
-    // TODO [un]selected styles?
+        Lib.extendFlat(scene.matrixOptions, convertMarkerStyle(trace));
+        // TODO [un]selected styles?
 
-    var opts = Lib.extendFlat({}, scene.matrixOptions, scene.viewOpts);
+        var opts = Lib.extendFlat({}, scene.matrixOptions, scene.viewOpts);
 
-    // TODO this is too long for arrayOk attributes!
-    scene.matrix.update(opts, null);
+        // TODO this is too long for arrayOk attributes!
+        scene.matrix.update(opts, null);
+    }
 }
 
 function hoverPoints(pointData, xval, yval) {

src/traces/splom/index.js

@@ -0,0 +1,59 @@
+{
+  "data": [
+    {
+      "x": [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19],
+      "y": [0,0,0,0,0,0,0,0,0,0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+      "z": [0,1,0,2,0,3,0,4,0,5,0, 6, 0, 7, 0, 8, 0, 9, 0, 10],
+
+      "type": "scatter3d",
+      "mode":"lines+text",
+      "line":{ "width": 5 }
+    },
+    {
+      "x": [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19],
+      "y": [1,1,1,1,1,1,1,1,1,1,1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
+      "z": [0,1,0,2,0,3,0,4,0,5,0, 6, 0, 7, 0, 8, 0, 9, 0, 10],
+
+      "text": [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19],
+
+      "type": "scatter3d",
+      "mode":"lines+text",
+      "line":{ "width": 5 }
+    },
+    {
+      "x": [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19],
+      "y": [2,2,2,2,2,2,2,2,2,2,2, 2, 2, 2, 2, 2, 2, 2, 2, 2],
+      "z": [0,1,0,2,0,3,0,4,0,5,0, 6, 0, 7, 0, 8, 0, 9, 0, 10],
+
+      "text": [0,1e-3,0.1,"A","B","C","D","E","F","G",null,"I",null,"K","L","M","N",{"text":"X", "value":10.01},"Y","Zzz"],
+
+      "type": "scatter3d",
+      "mode":"lines+text",
+      "line":{ "width": 5 }
+    },
+    {
+      "x": [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19],
+      "y": [3,3,3,3,3,3,3,3,3,3,3, 3, 3, 3, 3, 3, 3, 3, 3, 3],
+      "z": [0,1,0,2,0,3,0,4,0,5,0, 6, 0, 7, 0, 8, 0, 9, 0, 10],
+
+      "text": [0,0.0,-0,-0.0,"","0","  ","E","\n","G",null,"I",null,"K",null,null,null,"X"],
+
+      "type": "scatter3d",
+      "mode":"lines+text",
+      "line":{ "width": 5 }
+    }
+
+  ],
+  "layout": {
+    "title":"scatter3d lines with good/bad/no input texts (including undefined, null & blank variations) should be displayed well on WEBGL",
+    "width": 1200,
+    "height": 900,
+    "scene":{
+      "camera":{
+        "eye":{"x":-1.25,"y":1.25,"z":1.25},
+        "center":{"x":0,"y":0,"z":0},
+        "up":{"x":0,"y":0,"z":1}
+      }
+    }
+  }
+}

test/image/baselines/gl3d_scatter3d-blank-text.png

@@ -397,6 +397,46 @@ describe('Bar.crossTraceCalc (formerly known as setPositions)', function() {
         assertArrayField(cd[2][0], 't.poffset', [-0.4]);
     });
 
+    it('should work with *width* typed arrays', function() {
+        var w = [0.1, 0.4, 0.7];
+
+        var gd = mockBarPlot([{
+            width: w,
+            y: [1, 2, 3]
+        }, {
+            width: new Float32Array(w),
+            y: [1, 2, 3]
+        }]);
+
+        var cd = gd.calcdata;
+        assertArrayField(cd[0][0], 't.barwidth', w);
+        assertArrayField(cd[1][0], 't.barwidth', w);
+        assertPointField(cd, 'x', [
+            [-0.2, 0.8, 1.8],
+            [0.2, 1.2, 2.2]
+        ]);
+    });
+
+    it('should work with *offset* typed arrays', function() {
+        var o = [0.1, 0.4, 0.7];
+
+        var gd = mockBarPlot([{
+            offset: o,
+            y: [1, 2, 3]
+        }, {
+            offset: new Float32Array(o),
+            y: [1, 2, 3]
+        }]);
+
+        var cd = gd.calcdata;
+        assertArrayField(cd[0][0], 't.poffset', o);
+        assertArrayField(cd[1][0], 't.poffset', o);
+        assertPointField(cd, 'x', [
+            [0.5, 1.8, 3.1],
+            [0.5, 1.8, 3.099]
+        ]);
+    });
+
     it('should guard against invalid width items', function() {
         var gd = mockBarPlot([{
             width: [null, 1, 0.8],

test/image/mocks/gl3d_scatter3d-blank-text.json

@@ -510,6 +510,27 @@ describe('Test gl3d plots', function() {
         .then(done);
     });
 
+
+    it('@gl should avoid passing blank texts to webgl', function(done) {
+        function assertIsFilled(msg) {
+            var fullLayout = gd._fullLayout;
+            expect(fullLayout.scene._scene.glplot.objects[0].glyphBuffer.length).not.toBe(0, msg);
+        }
+
+        Plotly.plot(gd, [{
+            type: 'scatter3d',
+            mode: 'text',
+            x: [1, 2, 3],
+            y: [2, 3, 1],
+            z: [3, 1, 2]
+        }])
+        .then(function() {
+            assertIsFilled('not to be empty text');
+        })
+        .catch(failTest)
+        .then(done);
+    });
+
 });
 
 describe('Test gl3d modebar handlers', function() {