Skip to content
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

Jump to bottom

Perf drawFramwork #2474

Merged
merged 17 commits into from
Mar 26, 2018
Merged

Perf drawFramwork #2474

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
d305564
perf makeSubplotData
etpinard Mar 13, 2018
7d881f6
replace selectAll().data([0]) with select() + .size()
etpinard Mar 13, 2018
5cc9af9
add ensureSingle & ensureSingleById lib methods
etpinard Mar 14, 2018
e32434e
replace selectAll().data([0]) with ensureSingle(ById)
etpinard Mar 14, 2018
e810c1e
:hocho: layoutStyles call in drawFramework step
etpinard Mar 14, 2018
8e6032d
bring back d3-esque method chains
etpinard Mar 14, 2018
b974eab
add toBeClassed custom matcher
etpinard Mar 14, 2018
fc8c386
fixup typo
etpinard Mar 14, 2018
5887104
stash base url on Drawing module object
etpinard Mar 15, 2018
42ec6a0
clear stashed base url off Drawing module on replot
etpinard Mar 16, 2018
928ff6d
do not try to clear ax layers on first render
etpinard Mar 19, 2018
a2c5c3d
use ensureSingle in plot bg lsInner routine
etpinard Mar 20, 2018
49177a2
lint in axes.js
etpinard Mar 20, 2018
8cf99a6
stash tickLabels selection in doTicks scope
etpinard Mar 20, 2018
5307125
fixup typo in select query & remove neccessary branch
etpinard Mar 26, 2018
4059764
:hocho: unnecessary scoped var
etpinard Mar 26, 2018
50ab638
Merge pull request #2487 from plotly/perf-drawFramwork-more
etpinard Mar 26, 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
4 changes: 1 addition & 3 deletions src/plot_api/plot_api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,9 +245,7 @@ exports.plot = function(gd, data, layout, config) {
.attr('height', fullLayout.height);
}

return Lib.syncOrAsync([
subroutines.layoutStyles
], gd);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Too funny, so it just works! We may never know what obviated this...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just worksTM

return Plots.previousPromises(gd);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@alexcjohnson tests are ✅ after removing the extra layoutStyles call. Good riddance ⛵

}

// draw anything that can affect margins.
Expand Down
4 changes: 1 addition & 3 deletions test/jasmine/tests/plot_api_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2440,9 +2440,7 @@ describe('Test plot api', function() {

function countCalls(counts) {
var callsFinal = Lib.extendFlat({}, counts);
// TODO: do we really need to do layoutStyles twice in Plotly.plot?
// We get one from drawFramework and another directly from Plotly.plot.
callsFinal.layoutStyles = (counts.layoutStyles || 0) + 2 * (counts.plot || 0);
callsFinal.layoutStyles = (counts.layoutStyles || 0) + (counts.plot || 0);

mockedMethods.forEach(function(m) {
expect(subroutines[m]).toHaveBeenCalledTimes(callsFinal[m] || 0);
Expand Down