diff --git a/package-lock.json b/package-lock.json index f50da72dab4..dd8ab4ef394 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3907,14 +3907,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -3929,20 +3927,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -4059,8 +4054,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -4072,7 +4066,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -4087,7 +4080,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -4095,14 +4087,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -4121,7 +4111,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -4202,8 +4191,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -4215,7 +4203,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -4337,7 +4324,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -4784,9 +4770,9 @@ } }, "gl-scatter3d": { - "version": "1.0.13", - "resolved": "https://registry.npmjs.org/gl-scatter3d/-/gl-scatter3d-1.0.13.tgz", - "integrity": "sha512-p9vsC5PTuMFJj8qcMRVYeS/pwqG+0w8E8AmkKXtSmAY4YJ7uZNlyRylojYIwxfI6vTwWMaTqYnPiWrfkBXvwqw==", + "version": "1.0.14", + "resolved": "https://registry.npmjs.org/gl-scatter3d/-/gl-scatter3d-1.0.14.tgz", + "integrity": "sha512-fF1XvHqQ68bAOBVXkG+1E67nbpj1lpJmSEGKRGep4PlndSlLQEXKephyhBPtOGk32/OEOWr4SamIBxRhlu882Q==", "requires": { "gl-buffer": "^2.0.6", "gl-mat4": "^1.0.0", diff --git a/package.json b/package.json index 04ec71bc0e9..9fdeadb59e9 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "gl-plot2d": "^1.3.1", "gl-plot3d": "^1.5.10", "gl-pointcloud2d": "^1.0.1", - "gl-scatter3d": "^1.0.13", + "gl-scatter3d": "^1.0.14", "gl-select-box": "^1.0.2", "gl-spikes2d": "^1.0.1", "gl-streamtube3d": "^1.1.0", diff --git a/test/image/baselines/gl3d_mesh3d_surface3d_scatter3d_line3d_error3d_log_reversed_ranges.png b/test/image/baselines/gl3d_mesh3d_surface3d_scatter3d_line3d_error3d_log_reversed_ranges.png index a9630efb91c..a5df09af1ad 100644 Binary files a/test/image/baselines/gl3d_mesh3d_surface3d_scatter3d_line3d_error3d_log_reversed_ranges.png and b/test/image/baselines/gl3d_mesh3d_surface3d_scatter3d_line3d_error3d_log_reversed_ranges.png differ diff --git a/test/image/baselines/gl3d_scatter3d-align-texts.png b/test/image/baselines/gl3d_scatter3d-align-texts.png new file mode 100644 index 00000000000..49478ca4be5 Binary files /dev/null and b/test/image/baselines/gl3d_scatter3d-align-texts.png differ diff --git a/test/image/baselines/gl3d_scatter3d-blank-text.png b/test/image/baselines/gl3d_scatter3d-blank-text.png index 628099722e4..163ba65518c 100644 Binary files a/test/image/baselines/gl3d_scatter3d-blank-text.png and b/test/image/baselines/gl3d_scatter3d-blank-text.png differ diff --git a/test/image/baselines/gl3d_text-weirdness.png b/test/image/baselines/gl3d_text-weirdness.png index 1e5ab77d53f..b56e1c1bb90 100644 Binary files a/test/image/baselines/gl3d_text-weirdness.png and b/test/image/baselines/gl3d_text-weirdness.png differ diff --git a/test/image/mocks/gl3d_scatter3d-align-texts.json b/test/image/mocks/gl3d_scatter3d-align-texts.json new file mode 100644 index 00000000000..29c24b36a9e --- /dev/null +++ b/test/image/mocks/gl3d_scatter3d-align-texts.json @@ -0,0 +1,49 @@ +{ + "data": [ + { + "x": [3], + "y": [0], + "z": [2], + "text": ["top"], + "type": "scatter3d", + "mode":"markers+text", + "textposition": "top center" + }, { + "x": [0], + "y": [0], + "z": [0], + "text": ["left"], + "type": "scatter3d", + "mode":"markers+text", + "textposition": "center left" + }, { + "x": [1], + "y": [0], + "z": [1], + "text": ["right"], + "type": "scatter3d", + "mode":"markers+text", + "textposition": "center right" + }, { + "x": [2], + "y": [0], + "z": [0], + "text": ["bottom"], + "type": "scatter3d", + "mode":"markers+text", + "textposition": "bottom center" + } + ], + "layout": { + "title":"Texts in scatter3d should be aligned to left, right, top or bottom & displayed well on WEBGL", + "width": 800, + "height": 600, + "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} + } + } + } +}