Merge branch 'master' into streamtube-traces

Author: etpinard

package-lock.json

@@ -58,7 +58,6 @@
     "@plotly/d3-sankey": "^0.5.0",
     "alpha-shape": "^1.0.0",
     "array-range": "^1.0.1",
-    "bubleify": "^1.0.0",
     "canvas-fit": "^1.5.0",
     "color-normalize": "^1.0.3",
     "color-rgba": "^2.0.0",
@@ -75,7 +74,7 @@
     "gl-error3d": "^1.0.7",
     "gl-heatmap2d": "^1.0.4",
     "gl-line3d": "^1.1.2",
-    "gl-mat4": "^1.1.2",
+    "gl-mat4": "^1.2.0",
     "gl-mesh3d": "^2.0.0",
     "gl-plot2d": "^1.3.1",
     "gl-plot3d": "^1.5.5",
@@ -122,7 +121,7 @@
     "check-node-version": "^3.2.0",
     "deep-equal": "^1.0.1",
     "ecstatic": "^3.2.0",
-    "eslint": "^4.18.0",
+    "eslint": "^4.19.1",
     "falafel": "^2.0.0",
     "fs-extra": "^2.0.0",
     "fuse.js": "^3.2.0",
@@ -131,27 +130,26 @@
     "image-size": "^0.6.2",
     "into-stream": "^3.1.0",
     "jasmine-core": "^2.99.1",
-    "jsdom": "^11.6.2",
-    "karma": "^2.0.0",
+    "jsdom": "^11.10.0",
+    "karma": "^2.0.2",
     "karma-browserify": "^5.2.0",
     "karma-chrome-launcher": "^2.0.0",
-    "karma-coverage": "^1.0.0",
     "karma-firefox-launcher": "^1.0.1",
-    "karma-jasmine": "^1.1.0",
+    "karma-jasmine": "^1.1.2",
     "karma-jasmine-spec-tags": "^1.0.1",
     "karma-spec-reporter": "0.0.32",
     "karma-verbose-reporter": "0.0.6",
     "madge": "^3.0.1",
-    "minify-stream": "^1.1.0",
+    "minify-stream": "^1.2.0",
     "minimist": "^1.2.0",
-    "node-sass": "^4.7.2",
+    "node-sass": "^4.9.0",
     "npm-link-check": "^2.0.0",
     "open": "0.0.5",
     "prepend-file": "^1.3.1",
     "prettysize": "1.1.0",
-    "read-last-lines": "^1.1.0",
+    "read-last-lines": "^1.4.0",
     "requirejs": "^2.3.1",
-    "run-series": "^1.1.4",
+    "run-series": "^1.1.8",
     "through2": "^2.0.3",
     "true-case-path": "^1.0.2",
     "watchify": "^3.10.0",

package.json

@@ -23,8 +23,12 @@ var createRegl = require('regl');
  * @param {array} extensions : list of extension to pass to createRegl
  */
 module.exports = function prepareRegl(gd, extensions) {
-    gd._fullLayout._glcanvas.each(function(d) {
+    var fullLayout = gd._fullLayout;
+
+    fullLayout._glcanvas.each(function(d) {
         if(d.regl) return;
+        // only parcoords needs pick layer
+        if(d.pick && !fullLayout._has('parcoords')) return;
 
         d.regl = createRegl({
             canvas: this,

src/lib/prepare_regl.js

@@ -84,7 +84,7 @@ function heatmappishCalc(gd, trace) {
     z = trace._z = clean2dArray(trace._z || trace.z, trace.transpose);
 
     trace._emptypoints = findEmpties(z);
-    trace._interpz = interp2d(z, trace._emptypoints, trace._interpz);
+    interp2d(z, trace._emptypoints);
 
     // create arrays of brick boundaries, to be used by autorange and heatmap.plot
     var xlen = maxRowLength(z),

src/traces/contourcarpet/calc.js

@@ -77,7 +77,7 @@ module.exports = function calc(gd, trace) {
 
         if(isContour || trace.connectgaps) {
             trace._emptypoints = findEmpties(z);
-            trace._interpz = interp2d(z, trace._emptypoints, trace._interpz);
+            interp2d(z, trace._emptypoints);
         }
     }
 

src/traces/heatmap/calc.js

@@ -10,34 +10,37 @@
 
 var Lib = require('../../lib');
 
-var INTERPTHRESHOLD = 1e-2,
-    NEIGHBORSHIFTS = [[-1, 0], [1, 0], [0, -1], [0, 1]];
+var INTERPTHRESHOLD = 1e-2;
+var NEIGHBORSHIFTS = [[-1, 0], [1, 0], [0, -1], [0, 1]];
 
 function correctionOvershoot(maxFractionalChange) {
     // start with less overshoot, until we know it's converging,
     // then ramp up the overshoot for faster convergence
     return 0.5 - 0.25 * Math.min(1, maxFractionalChange * 0.5);
 }
 
-module.exports = function interp2d(z, emptyPoints, savedInterpZ) {
-    // fill in any missing data in 2D array z using an iterative
-    // poisson equation solver with zero-derivative BC at edges
-    // amazingly, this just amounts to repeatedly averaging all the existing
-    // nearest neighbors (at least if we don't take x/y scaling into account)
-    var maxFractionalChange = 1,
-        i,
-        thisPt;
-
-    if(Array.isArray(savedInterpZ)) {
-        for(i = 0; i < emptyPoints.length; i++) {
-            thisPt = emptyPoints[i];
-            z[thisPt[0]][thisPt[1]] = savedInterpZ[thisPt[0]][thisPt[1]];
-        }
-    }
-    else {
-        // one pass to fill in a starting value for all the empties
-        iterateInterp2d(z, emptyPoints);
-    }
+/*
+ * interp2d: Fill in missing data from a 2D array using an iterative
+ *   poisson equation solver with zero-derivative BC at edges.
+ *   Amazingly, this just amounts to repeatedly averaging all the existing
+ *   nearest neighbors, at least if we don't take x/y scaling into account,
+ *   which is the right approach here where x and y may not even have the
+ *   same units.
+ *
+ * @param {array of arrays} z
+ *      The 2D array to fill in. Will be mutated here. Assumed to already be
+ *      cleaned, so all entries are numbers except gaps, which are `undefined`.
+ * @param {array of arrays} emptyPoints
+ *      Each entry [i, j, neighborCount] for empty points z[i][j] and the number
+ *      of neighbors that are *not* missing. Assumed to be sorted from most to
+ *      least neighbors, as produced by heatmap/find_empties.
+ */
+module.exports = function interp2d(z, emptyPoints) {
+    var maxFractionalChange = 1;
+    var i;
+
+    // one pass to fill in a starting value for all the empties
+    iterateInterp2d(z, emptyPoints);
 
     // we're don't need to iterate lone empties - remove them
     for(i = 0; i < emptyPoints.length; i++) {

src/traces/heatmap/interp2d.js

@@ -6,7 +6,7 @@ root=$(dirname $0)/..
 # tests that aren't run on CI (yet)
 
 # jasmine specs with @noCI tag
-npm run test-jasmine -- --tags=noCI --nowatch || EXIT_STATE=$?
+npm run test-jasmine -- --tags=noCI,noCIdep --nowatch || EXIT_STATE=$?
 
 # mapbox image tests take too much resources on CI
 #

tasks/noci_test.sh

@@ -210,6 +210,13 @@ func.defaultConfig = {
     // A few tests don't behave well on CI
     // add @noCI to the spec description to skip a spec on CI
     //
+    // Although not recommended, some tests "depend" on other
+    // tests to pass (e.g. the Plotly.react tests check that
+    // all available traces and transforms are tested). Tag these
+    // with @noCIdep, so that
+    // - $ npm run test-jasmine -- tags=noCI,noCIdep
+    // can pass.
+    //
     // Label tests that require a WebGL-context by @gl so that
     // they can be skipped using:
     // - $ npm run test-jasmine -- --skip-tags=gl

test/jasmine/karma.conf.js

@@ -458,4 +458,46 @@ describe('contour plotting and editing', function() {
         .catch(fail)
         .then(done);
     });
+
+    it('can change z values with gaps', function(done) {
+        Plotly.newPlot(gd, [{
+            type: 'contour',
+            z: [[1, 2], [null, 4], [1, 2]]
+        }])
+        .then(function() {
+            expect(gd.calcdata[0][0].z).toEqual([[1, 2], [2, 4], [1, 2]]);
+            expect(gd.calcdata[0][0].zmask).toEqual([[1, 1], [0, 1], [1, 1]]);
+
+            return Plotly.react(gd, [{
+                type: 'contour',
+                z: [[6, 5], [8, 7], [null, 10]]
+            }]);
+        })
+        .then(function() {
+            expect(gd.calcdata[0][0].z).toEqual([[6, 5], [8, 7], [9, 10]]);
+            expect(gd.calcdata[0][0].zmask).toEqual([[1, 1], [1, 1], [0, 1]]);
+
+            return Plotly.react(gd, [{
+                type: 'contour',
+                z: [[1, 2], [null, 4], [1, 2]]
+            }]);
+        })
+        .then(function() {
+            expect(gd.calcdata[0][0].z).toEqual([[1, 2], [2, 4], [1, 2]]);
+            expect(gd.calcdata[0][0].zmask).toEqual([[1, 1], [0, 1], [1, 1]]);
+
+            return Plotly.react(gd, [{
+                type: 'contour',
+                // notice that this one is the same as the previous, except that
+                // a previously present value was removed...
+                z: [[1, 2], [null, 4], [1, null]]
+            }]);
+        })
+        .then(function() {
+            expect(gd.calcdata[0][0].z).toEqual([[1, 2], [2, 4], [1, 2.5]]);
+            expect(gd.calcdata[0][0].zmask).toEqual([[1, 1], [0, 1], [1, 0]]);
+        })
+        .catch(fail)
+        .then(done);
+    });
 });