Skip to content

Fix for scattergl reversed lines bug #3078

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Oct 24, 2018
Merged

Fix for scattergl reversed lines bug #3078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d6e1ce2
line2d library fix for reversed bounds, issue: 2904
archmoj Oct 2, 2018
3b2d3fb
fix for horizontal lines
archmoj Oct 4, 2018
c7191d2
updated package-lock
archmoj Oct 4, 2018
4c29bce
allow negative scales for reversed bounds
archmoj Oct 4, 2018
71b6f0d
fix for reversed ranges and to display horizontal lines too
archmoj Oct 4, 2018
5f1b85d
added mocks for image test
archmoj Oct 14, 2018
8779828
correct baseline images to show the bug fix
archmoj Oct 14, 2018
47a3a0c
removed if statement and comments
archmoj Oct 16, 2018
dadbd23
using new version of regl-line2d
archmoj Oct 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
"polybooljs": "^1.2.0",
"regl": "^1.3.7",
"regl-error2d": "^2.0.5",
"regl-line2d": "^3.0.11",
"regl-line2d": "^3.0.12",
"regl-scatter2d": "^3.0.6",
"regl-splom": "^1.0.4",
"right-now": "^1.0.0",
Expand Down
Binary file added test/image/baselines/gl2d_lines_almost_horizontal_vertical.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added test/image/baselines/gl2d_scattergl_simple_line_reversed_ranges.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions test/image/mocks/gl2d_lines_almost_horizontal_vertical.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"data":
[
{"mode":"lines", "line":{"width": 4}, "x":[1, 2, 3, 4], "y":[4, 4, 4.0001, 3.9999], "type":"scatter", "name":"scatter almost horizontal"},
{"mode":"lines", "line":{"width": 4}, "x":[1, 2, 3, 4], "y":[3, 3, 3.0001, 2.9999], "type":"scattergl", "name":"scattergl almost horizontal"},
{"mode":"lines", "line":{"width": 4}, "x":[1, 2, 3, 4], "y":[2, 2, 2, 2], "type":"scattergl", "name":"scattergl horizontal"},
{"mode":"lines", "line":{"width": 4}, "x":[1, 2, 3, 4], "y":[1, 1, 1, 1], "type":"scatter", "name":"scatter horizontal"},
{"mode":"lines", "line":{"width": 4}, "y":[1, 2, 3, 4], "x":[4, 4, 4.0001, 3.9999], "type":"scatter", "name":"scatter almost vertical"},
{"mode":"lines", "line":{"width": 4}, "y":[1, 2, 3, 4], "x":[3, 3, 3.0001, 2.9999], "type":"scattergl", "name":"scattergl almost vertical"},
{"mode":"lines", "line":{"width": 4}, "y":[1, 2, 3, 4], "x":[2, 2, 2, 2], "type":"scattergl", "name":"scattergl vertical"},
{"mode":"lines", "line":{"width": 4}, "y":[1, 2, 3, 4], "x":[1, 1, 1, 1], "type":"scatter", "name":"scatter vertical"}
], "layout": {"width":800, "height":600, "xaxis":{"range":[4.5, 0.5]}, "yaxis":{"range":[4.5, 0.5]}, "title": "exact and approximate horizontal and vertical lines using scatter and scattergl with reversed ranges" }
}
8 changes: 8 additions & 0 deletions test/image/mocks/gl2d_scattergl_simple_line_reversed_ranges.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"data":
[
{ "type": "scattergl", "mode": "lines", "x": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], "y": [0, 1, 0, 7, 7, 0, 2, 4, 3, 0], "line": { "width": 10, "dash": "solid" } },
{ "type": "scattergl", "mode": "lines", "y": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], "x": [0, 1, 0, 7, 7, 0, 2, 4, 3, 0], "line": { "width": 10, "dash": "solid" } }
],
"layout": {"width":800, "height":600, "xaxis":{ "range": [-1, 11] }, "yaxis":{ "autorange": "reversed" }, "title": "simple scatter lines (without markers or text) with reversed ranges" }
}