Skip to content

Cartesian subplot updates using data joins #946

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
etpinard merged 17 commits into from
Oct 6, 2016
Merged

Cartesian subplot updates using data joins #946

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c877c27
move subplot creation from makePlotFramework -> Cartesian.plot
etpinard Sep 15, 2016
ff26691
rm some early-Plotly.plot logic regarding makePlotFramwork
etpinard Sep 15, 2016
40fc7f9
plots: add linkSubplot method
etpinard Sep 15, 2016
652b905
first try at making the new cartesian subplot paradigm work
etpinard Sep 15, 2016
e85a6c7
keep ref to subplot image/shape layers in main drawData
etpinard Sep 15, 2016
43d227a
lint
etpinard Sep 16, 2016
937c54b
add baseModule drawFramework step
etpinard Sep 16, 2016
78faa3f
plots: add a cartesian subplot purge step
etpinard Sep 16, 2016
f8017f2
test: adapt relinkPrivateKeys test
etpinard Sep 16, 2016
c239602
test: adapt legend scroll test
etpinard Sep 16, 2016
f4aee1e
test: adapt gd._ keys ordering
etpinard Sep 16, 2016
ab96422
test: check clip path & dragger counts in cartesian plots
etpinard Sep 16, 2016
8c09af2
Merge branch 'master' into cartesian-per-subplot
etpinard Sep 16, 2016
b00d716
Merge branch 'master' into cartesian-per-subplot
etpinard Oct 4, 2016
ae3ab55
replace plotinfo.x() -> plotinfo.xaxis
etpinard Sep 23, 2016
a708381
make makeSubplotLayer agnostic to fullLayout
etpinard Oct 5, 2016
e78b099
rm useless return in makePlotFramework
etpinard Oct 6, 2016
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
Prev Previous commit
Next Next commit
plots: add a cartesian subplot purge step
  • Loading branch information
@etpinard
etpinard committed Sep 16, 2016
commit 78faa3fe4399d13c37207499c451c82e7da701af
34 changes: 32 additions & 2 deletions src/plots/cartesian/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
'use strict';

var d3 = require('d3');
var Lib = require('../../lib');
var Plots = require('../plots');
var Axes = require('./axes');

var constants = require('./constants');

exports.name = 'cartesian';
Expand Down Expand Up @@ -147,20 +147,33 @@ exports.clean = function(newFullData, newFullLayout, oldFullData, oldFullLayout)
}
}
}

var hadCartesian = (oldFullLayout._has && oldFullLayout._has('cartesian'));
var hasCartesian = (newFullLayout._has && newFullLayout._has('cartesian'));

if(hadCartesian && !hasCartesian) {
var subplotLayers = oldFullLayout._cartesianlayer.selectAll('.subplot');

subplotLayers.call(purgeSubplotLayers, oldFullLayout);
oldFullLayout._defs.selectAll('.axesclip').remove();
}
};

exports.drawFramework = function(gd) {
var fullLayout = gd._fullLayout,
subplotData = makeSubplotData(gd);

var subplotLayers = fullLayout._cartesianlayer.selectAll('.subplot')
.data(subplotData, String);
.data(subplotData, Lib.identity);

subplotLayers.enter().append('g')
.classed('subplot', true);

subplotLayers.order();
Copy link
Contributor Author

@etpinard etpinard Sep 16, 2016

Choose a reason for hiding this comment

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

See http://codepen.io/etpinard/pen/mAEBVz for example of this pattern


subplotLayers.exit()
.call(purgeSubplotLayers, fullLayout);

subplotLayers.each(function(subplot) {
var plotgroup = d3.select(this),
plotinfo = fullLayout._plots[subplot];
Expand Down Expand Up @@ -316,6 +329,23 @@ function makeSubplotLayer(plotgroup, gd, subplot) {
.classed('crisp', true);
}

function purgeSubplotLayers(layers, fullLayout) {
if(!layers) return;

layers.each(function(subplot) {
var plotgroup = d3.select(this),
clipId = 'clip' + fullLayout._uid + subplot + 'plot';

plotgroup.remove();
fullLayout._draggers.selectAll('g.' + subplot).remove();
fullLayout._defs.select('#' + clipId).remove();

// do not remove individual axis <clipPath>s here
// as other subplots may need them
});
}


function joinLayer(parent, nodeType, className) {
Copy link
Contributor Author

@etpinard etpinard Sep 16, 2016

Choose a reason for hiding this comment

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

Good enough for Lib function ???

Copy link
Contributor

@rreusser rreusser Oct 5, 2016 •
edited
Loading

Choose a reason for hiding this comment

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

Yes, def. We use this pattern all over the place, and it's invalid in d3 v4 without some minor modifications, so would be good to extract.

Copy link
Contributor Author

@etpinard etpinard Oct 6, 2016

Choose a reason for hiding this comment

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

I'll defer that to a future PR.

var layer = parent.selectAll('.' + className)
.data([0]);
Expand Down