diff --git a/src/plots/gl2d/scene2d.js b/src/plots/gl2d/scene2d.js index 00fc49969f0..df254df6b00 100644 --- a/src/plots/gl2d/scene2d.js +++ b/src/plots/gl2d/scene2d.js @@ -259,13 +259,6 @@ proto.computeTickMarks = function() { this.xaxis.setScale(); this.yaxis.setScale(); - // override _length from backward compatibility - // even though setScale 'should' give the correct result - this.xaxis._length = - this.glplot.viewBox[2] - this.glplot.viewBox[0]; - this.yaxis._length = - this.glplot.viewBox[3] - this.glplot.viewBox[1]; - var nextTicks = [ Axes.calcTicks(this.xaxis), Axes.calcTicks(this.yaxis) diff --git a/test/image/baselines/gl2d_10.png b/test/image/baselines/gl2d_10.png index 1577e102175..d822d650409 100644 Binary files a/test/image/baselines/gl2d_10.png and b/test/image/baselines/gl2d_10.png differ diff --git a/test/image/baselines/gl2d_12.png b/test/image/baselines/gl2d_12.png index e6bdc6f5ad3..730a8299a6c 100644 Binary files a/test/image/baselines/gl2d_12.png and b/test/image/baselines/gl2d_12.png differ diff --git a/test/image/baselines/gl2d_14.png b/test/image/baselines/gl2d_14.png index 3f87538f59a..e737ab88e45 100644 Binary files a/test/image/baselines/gl2d_14.png and b/test/image/baselines/gl2d_14.png differ diff --git a/test/image/baselines/gl2d_17.png b/test/image/baselines/gl2d_17.png index ff7bce30f2a..0539d429294 100644 Binary files a/test/image/baselines/gl2d_17.png and b/test/image/baselines/gl2d_17.png differ diff --git a/test/image/baselines/gl2d_axes_booleans.png b/test/image/baselines/gl2d_axes_booleans.png index fc9d6e687d8..90ff2f77818 100644 Binary files a/test/image/baselines/gl2d_axes_booleans.png and b/test/image/baselines/gl2d_axes_booleans.png differ diff --git a/test/image/baselines/gl2d_axes_labels.png b/test/image/baselines/gl2d_axes_labels.png index 7e817927a65..05f36c528ac 100644 Binary files a/test/image/baselines/gl2d_axes_labels.png and b/test/image/baselines/gl2d_axes_labels.png differ diff --git a/test/image/baselines/gl2d_axes_lines.png b/test/image/baselines/gl2d_axes_lines.png index a5d6ba34cc4..d13e0582e51 100644 Binary files a/test/image/baselines/gl2d_axes_lines.png and b/test/image/baselines/gl2d_axes_lines.png differ diff --git a/test/image/baselines/gl2d_axes_range_mode.png b/test/image/baselines/gl2d_axes_range_mode.png index 13d688b8a4d..3de858812e7 100644 Binary files a/test/image/baselines/gl2d_axes_range_mode.png and b/test/image/baselines/gl2d_axes_range_mode.png differ diff --git a/test/image/baselines/gl2d_axes_range_type.png b/test/image/baselines/gl2d_axes_range_type.png index 07b5dee26eb..953f3b44c2b 100644 Binary files a/test/image/baselines/gl2d_axes_range_type.png and b/test/image/baselines/gl2d_axes_range_type.png differ diff --git a/test/image/baselines/gl2d_connect_gaps.png b/test/image/baselines/gl2d_connect_gaps.png index 8c596c08568..1ca8bb38f1f 100644 Binary files a/test/image/baselines/gl2d_connect_gaps.png and b/test/image/baselines/gl2d_connect_gaps.png differ diff --git a/test/image/baselines/gl2d_date_axes.png b/test/image/baselines/gl2d_date_axes.png index 7f20e6358a5..ba6e7d0b66b 100644 Binary files a/test/image/baselines/gl2d_date_axes.png and b/test/image/baselines/gl2d_date_axes.png differ diff --git a/test/image/baselines/gl2d_error_bars.png b/test/image/baselines/gl2d_error_bars.png index 5a846749834..0adfdf78ca8 100644 Binary files a/test/image/baselines/gl2d_error_bars.png and b/test/image/baselines/gl2d_error_bars.png differ diff --git a/test/image/baselines/gl2d_heatmapgl.png b/test/image/baselines/gl2d_heatmapgl.png index 5866b2e628d..82b45f844e5 100644 Binary files a/test/image/baselines/gl2d_heatmapgl.png and b/test/image/baselines/gl2d_heatmapgl.png differ diff --git a/test/image/baselines/gl2d_multiple_subplots.png b/test/image/baselines/gl2d_multiple_subplots.png index fc778526a29..5b514f69f29 100644 Binary files a/test/image/baselines/gl2d_multiple_subplots.png and b/test/image/baselines/gl2d_multiple_subplots.png differ diff --git a/test/image/baselines/gl2d_scatter-colorscale-colorbar.png b/test/image/baselines/gl2d_scatter-colorscale-colorbar.png index cccbe8b3bb5..055f36f6108 100644 Binary files a/test/image/baselines/gl2d_scatter-colorscale-colorbar.png and b/test/image/baselines/gl2d_scatter-colorscale-colorbar.png differ diff --git a/test/image/baselines/gl2d_scatter-marker-line-colorscales.png b/test/image/baselines/gl2d_scatter-marker-line-colorscales.png index f4af6f0adb3..b077fd2f094 100644 Binary files a/test/image/baselines/gl2d_scatter-marker-line-colorscales.png and b/test/image/baselines/gl2d_scatter-marker-line-colorscales.png differ diff --git a/test/image/baselines/gl2d_simple_inset.png b/test/image/baselines/gl2d_simple_inset.png index d6ec8356d10..88004d7eaba 100644 Binary files a/test/image/baselines/gl2d_simple_inset.png and b/test/image/baselines/gl2d_simple_inset.png differ diff --git a/test/image/baselines/gl2d_size_margins.png b/test/image/baselines/gl2d_size_margins.png index afa21448c75..83e37357b78 100644 Binary files a/test/image/baselines/gl2d_size_margins.png and b/test/image/baselines/gl2d_size_margins.png differ diff --git a/test/image/baselines/gl2d_stacked_coupled_subplots.png b/test/image/baselines/gl2d_stacked_coupled_subplots.png index 76a20172b2c..a288fb16e0c 100644 Binary files a/test/image/baselines/gl2d_stacked_coupled_subplots.png and b/test/image/baselines/gl2d_stacked_coupled_subplots.png differ diff --git a/test/image/baselines/gl2d_stacked_subplots.png b/test/image/baselines/gl2d_stacked_subplots.png index 4e2e78cac09..fb750b40520 100644 Binary files a/test/image/baselines/gl2d_stacked_subplots.png and b/test/image/baselines/gl2d_stacked_subplots.png differ diff --git a/test/jasmine/tests/gl2d_click_test.js b/test/jasmine/tests/gl2d_click_test.js index ef9896fb254..739055b81eb 100644 --- a/test/jasmine/tests/gl2d_click_test.js +++ b/test/jasmine/tests/gl2d_click_test.js @@ -224,7 +224,7 @@ describe('Test hover and click interactions', function() { bordercolor: _mock.data[0].x.map(function(_, i) { return i % 2 ? 'red' : 'green'; }) }; - var run = makeRunner([655, 317], { + var run = makeRunner([634, 321], { x: 15.772, y: 0.387, label: ['0.387'], @@ -249,7 +249,7 @@ describe('Test hover and click interactions', function() { var _mock = Lib.extendDeep({}, mock1); _mock.data[0].hoverinfo = 'none'; - var run = makeRunner([655, 317], { + var run = makeRunner([634, 321], { x: 15.772, y: 0.387, curveNumber: 0, diff --git a/test/jasmine/tests/gl_plot_interact_test.js b/test/jasmine/tests/gl_plot_interact_test.js index de8df21bae8..8bc1f4cebba 100644 --- a/test/jasmine/tests/gl_plot_interact_test.js +++ b/test/jasmine/tests/gl_plot_interact_test.js @@ -826,10 +826,10 @@ describe('Test gl2d plots', function() { var _mock = Lib.extendDeep({}, mock); var relayoutCallback = jasmine.createSpy('relayoutCallback'); - var originalX = [-0.022068095838587643, 5.022068095838588]; - var originalY = [-0.21331533513634046, 5.851205650049042]; - var newX = [-0.23224043715846995, 4.811895754518705]; - var newY = [-1.2962655110623016, 4.768255474123081]; + var originalX = [-0.3037383177570093, 5.303738317757009]; + var originalY = [-0.5532219548705213, 6.191112269783224]; + var newX = [-0.5373831775700935, 5.070093457943925]; + var newY = [-1.7575673521301187, 4.986766872523626]; var precision = 5; Plotly.plot(gd, _mock) @@ -1326,10 +1326,10 @@ describe('Test gl2d interactions', function() { dragmode: 'pan' }) .then(function() { - assertAnnotation([327, 325]); + assertAnnotation([327, 315]); drag([250, 200], [200, 150]); - assertAnnotation([277, 275]); + assertAnnotation([277, 265]); return Plotly.relayout(gd, { 'xaxis.range': [1.5, 2.5],