From 09ad12affacdc4e7cbad7230db0949ba6e8a4599 Mon Sep 17 00:00:00 2001 From: archmoj Date: Wed, 24 Jun 2020 14:27:14 -0400 Subject: [PATCH 1/3] declare zsmooth for heatmapgl and link to a fork that handles smooth and discrete options - add image test for heatmapgl with false zsmooth i.e. discrete --- package-lock.json | 7 +- package.json | 2 +- src/traces/heatmapgl/attributes.js | 9 ++ src/traces/heatmapgl/convert.js | 14 +- src/traces/heatmapgl/defaults.js | 1 + .../baselines/gl2d_heatmapgl_discrete.png | Bin 0 -> 18189 bytes test/image/mocks/gl2d_heatmapgl_discrete.json | 135 ++++++++++++++++++ test/jasmine/tests/mock_test.js | 2 + 8 files changed, 163 insertions(+), 7 deletions(-) create mode 100644 test/image/baselines/gl2d_heatmapgl_discrete.png create mode 100644 test/image/mocks/gl2d_heatmapgl_discrete.json diff --git a/package-lock.json b/package-lock.json index e8576ea1ccf..62baacce7ff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4594,16 +4594,15 @@ } }, "gl-heatmap2d": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/gl-heatmap2d/-/gl-heatmap2d-1.0.6.tgz", - "integrity": "sha512-+agzSv4R5vsaH+AGYVz5RVzBK10amqAa+Bwj205F13JjNSGS91M1L9Yb8zssCv2FIjpP+1Mp73cFBYrQFfS1Jg==", + "version": "git://github.com/archmoj/gl-heatmap2d.git#b4acf09176072084604c2e54535a6148b0d6eba6", + "from": "git://github.com/archmoj/gl-heatmap2d.git#b4acf09176072084604c2e54535a6148b0d6eba6", "requires": { "binary-search-bounds": "^2.0.4", "gl-buffer": "^2.1.2", "gl-shader": "^4.2.1", "glslify": "^7.0.0", "iota-array": "^1.0.0", - "typedarray-pool": "^1.1.0" + "typedarray-pool": "^1.2.0" } }, "gl-line3d": { diff --git a/package.json b/package.json index 1cd36c8ead8..49cdc5ff903 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "gl-cone3d": "^1.5.2", "gl-contour2d": "^1.1.7", "gl-error3d": "^1.0.16", - "gl-heatmap2d": "^1.0.6", + "gl-heatmap2d": "git://github.com/archmoj/gl-heatmap2d.git#b4acf09176072084604c2e54535a6148b0d6eba6", "gl-line3d": "1.2.1", "gl-mat4": "^1.2.0", "gl-mesh3d": "^2.3.1", diff --git a/src/traces/heatmapgl/attributes.js b/src/traces/heatmapgl/attributes.js index f0ef216766d..a47ce9c8ac3 100644 --- a/src/traces/heatmapgl/attributes.js +++ b/src/traces/heatmapgl/attributes.js @@ -29,6 +29,15 @@ for(var i = 0; i < commonList.length; i++) { attrs[k] = heatmapAttrs[k]; } +attrs.zsmooth = { + valType: 'enumerated', + values: ['fast', false], + dflt: 'fast', + role: 'style', + editType: 'calc', + description: 'Picks a smoothing algorithm use to smooth `z` data.' +}; + extendFlat( attrs, colorScaleAttrs('', {cLetter: 'z', autoColorDflt: false}) diff --git a/src/traces/heatmapgl/convert.js b/src/traces/heatmapgl/convert.js index ae8727125b9..d78723dc05d 100644 --- a/src/traces/heatmapgl/convert.js +++ b/src/traces/heatmapgl/convert.js @@ -31,6 +31,7 @@ function Heatmap(scene, uid) { this.bounds = [0, 0, 0, 0]; this.options = { + zsmooth: 'fast', z: [], x: [], y: [], @@ -85,6 +86,7 @@ proto.update = function(fullTrace, calcTrace) { this.options.x = calcPt.x; this.options.y = calcPt.y; + this.options.zsmooth = fullTrace.zsmooth; var colorOptions = convertColorscale(fullTrace); this.options.colorLevels = colorOptions.colorLevels; @@ -97,8 +99,16 @@ proto.update = function(fullTrace, calcTrace) { var xa = this.scene.xaxis; var ya = this.scene.yaxis; - fullTrace._extremes[xa._id] = Axes.findExtremes(xa, calcPt.x); - fullTrace._extremes[ya._id] = Axes.findExtremes(ya, calcPt.y); + + var xOpts, yOpts; + if(fullTrace.zsmooth === false) { + // increase padding for discretised heatmap as suggested by Louise Ord + xOpts = { ppad: calcPt.x[1] - calcPt.x[0] }; + yOpts = { ppad: calcPt.y[1] - calcPt.y[0] }; + } + + fullTrace._extremes[xa._id] = Axes.findExtremes(xa, calcPt.x, xOpts); + fullTrace._extremes[ya._id] = Axes.findExtremes(ya, calcPt.y, yOpts); }; proto.dispose = function() { diff --git a/src/traces/heatmapgl/defaults.js b/src/traces/heatmapgl/defaults.js index b9ead7b8107..1f164bc33c5 100644 --- a/src/traces/heatmapgl/defaults.js +++ b/src/traces/heatmapgl/defaults.js @@ -28,6 +28,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout } coerce('text'); + coerce('zsmooth'); colorscaleDefaults(traceIn, traceOut, layout, coerce, {prefix: '', cLetter: 'z'}); }; diff --git a/test/image/baselines/gl2d_heatmapgl_discrete.png b/test/image/baselines/gl2d_heatmapgl_discrete.png new file mode 100644 index 0000000000000000000000000000000000000000..da2bc2df7e27df8402b54a08d14fd04fc7523f3d GIT binary patch literal 18189 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 Date: Mon, 6 Jul 2020 10:02:47 -0400 Subject: [PATCH 2/3] apply fixfor bounds offset shift --- package-lock.json | 4 ++-- package.json | 2 +- .../baselines/gl2d_heatmapgl_discrete.png | Bin 18189 -> 18173 bytes 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 62baacce7ff..6fe67d6de2b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4594,8 +4594,8 @@ } }, "gl-heatmap2d": { - "version": "git://github.com/archmoj/gl-heatmap2d.git#b4acf09176072084604c2e54535a6148b0d6eba6", - "from": "git://github.com/archmoj/gl-heatmap2d.git#b4acf09176072084604c2e54535a6148b0d6eba6", + "version": "git://github.com/ordiology/gl-heatmap2d.git#f11a3a4f2114704386afe01eb66968f9f821d599", + "from": "git://github.com/ordiology/gl-heatmap2d.git#f11a3a4f2114704386afe01eb66968f9f821d599", "requires": { "binary-search-bounds": "^2.0.4", "gl-buffer": "^2.1.2", diff --git a/package.json b/package.json index 49cdc5ff903..a6369d73dcc 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "gl-cone3d": "^1.5.2", "gl-contour2d": "^1.1.7", "gl-error3d": "^1.0.16", - "gl-heatmap2d": "git://github.com/archmoj/gl-heatmap2d.git#b4acf09176072084604c2e54535a6148b0d6eba6", + "gl-heatmap2d": "git://github.com/ordiology/gl-heatmap2d.git#f11a3a4f2114704386afe01eb66968f9f821d599", "gl-line3d": "1.2.1", "gl-mat4": "^1.2.0", "gl-mesh3d": "^2.3.1", diff --git a/test/image/baselines/gl2d_heatmapgl_discrete.png b/test/image/baselines/gl2d_heatmapgl_discrete.png index da2bc2df7e27df8402b54a08d14fd04fc7523f3d..4885dd3861d31158229f65eb11f971a18ce2d5b5 100644 GIT binary patch literal 18173 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 Date: Mon, 20 Jul 2020 08:42:13 -0400 Subject: [PATCH 3/3] bump gl-heatmap2d version --- package-lock.json | 5 +++-- package.json | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6fe67d6de2b..7299454d205 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4594,8 +4594,9 @@ } }, "gl-heatmap2d": { - "version": "git://github.com/ordiology/gl-heatmap2d.git#f11a3a4f2114704386afe01eb66968f9f821d599", - "from": "git://github.com/ordiology/gl-heatmap2d.git#f11a3a4f2114704386afe01eb66968f9f821d599", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/gl-heatmap2d/-/gl-heatmap2d-1.1.0.tgz", + "integrity": "sha512-0FLXyxv6UBCzzhi4Q2u+9fUs6BX1+r5ZztFe27VikE9FUVw7hZiuSHmgDng92EpydogcSYHXCIK8+58RagODug==", "requires": { "binary-search-bounds": "^2.0.4", "gl-buffer": "^2.1.2", diff --git a/package.json b/package.json index a6369d73dcc..eb4684ab15d 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "gl-cone3d": "^1.5.2", "gl-contour2d": "^1.1.7", "gl-error3d": "^1.0.16", - "gl-heatmap2d": "git://github.com/ordiology/gl-heatmap2d.git#f11a3a4f2114704386afe01eb66968f9f821d599", + "gl-heatmap2d": "^1.1.0", "gl-line3d": "1.2.1", "gl-mat4": "^1.2.0", "gl-mesh3d": "^2.3.1",