From f1d37ecaba19d9e598e552ba0393c5679868641c Mon Sep 17 00:00:00 2001 From: archmoj Date: Thu, 14 Mar 2019 18:49:26 -0400 Subject: [PATCH 1/3] do not scale markers and circles using pixelRatio --- package-lock.json | 17 +++++++++++------ package.json | 2 +- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 281a0ef8e54..4d670bead2a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8892,17 +8892,23 @@ "dev": true }, "pxls": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/pxls/-/pxls-2.3.1.tgz", - "integrity": "sha512-942Z8pHA2TLje4NM34Y0Zb6SqvkXq8s+IOM50J1wsYvHdPZfnUNu6U2Qld95dy50HtC9aKi8ZpHcc/iQjsQmeQ==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/pxls/-/pxls-2.3.2.tgz", + "integrity": "sha512-pQkwgbLqWPcuES5iEmGa10OlCf5xG0blkIF3dg7PpRZShbTYcvAdfFfGL03SMrkaSUaa/V0UpN9HWg40O2AIIw==", "requires": { "arr-flatten": "^1.1.0", "compute-dims": "^1.1.0", "flip-pixels": "^1.0.2", + "is-browser": "^2.1.0", "is-buffer": "^2.0.3", "to-uint8": "^1.4.1" }, "dependencies": { + "is-browser": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-browser/-/is-browser-2.1.0.tgz", + "integrity": "sha512-F5rTJxDQ2sW81fcfOR1GnCXT6sVJC104fCyfj+mjpwNEwaPYSn5fte5jiHmBg3DHsIoL/l8Kvw5VN5SsTRcRFQ==" + }, "is-buffer": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz", @@ -9342,9 +9348,8 @@ } }, "regl-scatter2d": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/regl-scatter2d/-/regl-scatter2d-3.1.3.tgz", - "integrity": "sha512-71DpYoJKAopjCP8kRgdReoBLIUre9vsoUgoWDEEeSHRsDEqIwPguhuEerxXpqY5zZ8P3COEqjYZ/sGpoeI8WCA==", + "version": "git://github.com/gl-vis/regl-scatter2d.git#0fcb2a5b014ee1d4a743ed72bbcfb8ba05ace39b", + "from": "git://github.com/gl-vis/regl-scatter2d.git#0fcb2a5b014ee1d4a743ed72bbcfb8ba05ace39b", "requires": { "array-range": "^1.0.1", "array-rearrange": "^2.2.2", diff --git a/package.json b/package.json index 034b53eecff..bedfcf4ad61 100644 --- a/package.json +++ b/package.json @@ -104,7 +104,7 @@ "regl": "^1.3.11", "regl-error2d": "^2.0.6", "regl-line2d": "3.0.13", - "regl-scatter2d": "^3.1.3", + "regl-scatter2d": "git://github.com/gl-vis/regl-scatter2d.git#0fcb2a5b014ee1d4a743ed72bbcfb8ba05ace39b", "regl-splom": "^1.0.6", "right-now": "^1.0.0", "robust-orientation": "^1.1.3", From 8e8ba170512850795813d581a8d84e4c28a10c93 Mon Sep 17 00:00:00 2001 From: archmoj Date: Thu, 14 Mar 2019 19:10:25 -0400 Subject: [PATCH 2/3] need to rebuild regl-scatter2d bundle --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4d670bead2a..f6d5918dfae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9348,8 +9348,8 @@ } }, "regl-scatter2d": { - "version": "git://github.com/gl-vis/regl-scatter2d.git#0fcb2a5b014ee1d4a743ed72bbcfb8ba05ace39b", - "from": "git://github.com/gl-vis/regl-scatter2d.git#0fcb2a5b014ee1d4a743ed72bbcfb8ba05ace39b", + "version": "git://github.com/gl-vis/regl-scatter2d.git#6a8f3576467f41bc2f8d6a4e78c646e933532439", + "from": "git://github.com/gl-vis/regl-scatter2d.git#6a8f3576467f41bc2f8d6a4e78c646e933532439", "requires": { "array-range": "^1.0.1", "array-rearrange": "^2.2.2", diff --git a/package.json b/package.json index bedfcf4ad61..7547f643cc1 100644 --- a/package.json +++ b/package.json @@ -104,7 +104,7 @@ "regl": "^1.3.11", "regl-error2d": "^2.0.6", "regl-line2d": "3.0.13", - "regl-scatter2d": "git://github.com/gl-vis/regl-scatter2d.git#0fcb2a5b014ee1d4a743ed72bbcfb8ba05ace39b", + "regl-scatter2d": "git://github.com/gl-vis/regl-scatter2d.git#6a8f3576467f41bc2f8d6a4e78c646e933532439", "regl-splom": "^1.0.6", "right-now": "^1.0.0", "robust-orientation": "^1.1.3", From 08c2eddf87927a451f71f6e5bd1514ebadcffd36 Mon Sep 17 00:00:00 2001 From: archmoj Date: Thu, 11 Apr 2019 13:31:38 -0400 Subject: [PATCH 3/3] added a flag to regl-scatter2d and use that to keep marker size constant as if pixelRatio was 2 --- package-lock.json | 4 ++-- package.json | 2 +- src/traces/scattergl/index.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 47df08da55d..7221b79e7ca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9301,8 +9301,8 @@ } }, "regl-scatter2d": { - "version": "git://github.com/gl-vis/regl-scatter2d.git#8b781ac5b81c2f5562df2eedf92277b3857ab650", - "from": "git://github.com/gl-vis/regl-scatter2d.git#8b781ac5b81c2f5562df2eedf92277b3857ab650", + "version": "git://github.com/gl-vis/regl-scatter2d.git#9c0933a1df175f0bb6ba39a5e71e351e67161f2d", + "from": "git://github.com/gl-vis/regl-scatter2d.git#9c0933a1df175f0bb6ba39a5e71e351e67161f2d", "requires": { "array-range": "^1.0.1", "array-rearrange": "^2.2.2", diff --git a/package.json b/package.json index 183f84468fb..5fe391df536 100644 --- a/package.json +++ b/package.json @@ -104,7 +104,7 @@ "regl": "^1.3.11", "regl-error2d": "^2.0.6", "regl-line2d": "3.0.13", - "regl-scatter2d": "git://github.com/gl-vis/regl-scatter2d.git#8b781ac5b81c2f5562df2eedf92277b3857ab650", + "regl-scatter2d": "git://github.com/gl-vis/regl-scatter2d.git#9c0933a1df175f0bb6ba39a5e71e351e67161f2d", "regl-splom": "^1.0.6", "right-now": "^1.0.0", "robust-orientation": "^1.1.3", diff --git a/src/traces/scattergl/index.js b/src/traces/scattergl/index.js index 9b49ae3493d..0990ceac377 100644 --- a/src/traces/scattergl/index.js +++ b/src/traces/scattergl/index.js @@ -377,7 +377,7 @@ function plot(gd, subplot, cdata) { scene.line2d = createLine(regl); } if(scene.scatter2d === true) { - scene.scatter2d = createScatter(regl); + scene.scatter2d = createScatter(regl, { constPointSize: true }); } if(scene.fill2d === true) { scene.fill2d = createLine(regl);