Skip to content

Fix dendrogram #1063

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 3 commits into from
Oct 24, 2016
Merged

Fix dendrogram #1063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
05dd3a6
cartesian: use fullLayout._plots keys instead of Axes.getSubplots
etpinard Oct 20, 2016
faec7ba
cartesian: look for subplot ids in fullData instead of data if present
etpinard Oct 20, 2016
e27fa77
test: add dendrogram mock
etpinard Oct 20, 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
2 changes: 1 addition & 1 deletion src/plots/cartesian/axes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1207,7 +1207,7 @@ axes.getSubplots = function(gd, ax) {
var i, j, sp;

// look for subplots in the data
var data = gd.data || [];
var data = gd._fullData || gd.data || [];
Copy link
Collaborator

Choose a reason for hiding this comment

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

nonblocking, but do we even need gd.data here then?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I didn't want to break

image

Copy link
Collaborator

Choose a reason for hiding this comment

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

ah good call, forgot streambed might still be using this 👍


for(i = 0; i < data.length; i++) {
var trace = data[i];
Expand Down
2 changes: 1 addition & 1 deletion src/plots/cartesian/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ exports.rangePlot = function(gd, plotinfo, cdSubplot) {

function makeSubplotData(gd) {
var fullLayout = gd._fullLayout,
subplots = Axes.getSubplots(gd);
subplots = Object.keys(fullLayout._plots);

var subplotData = [],
overlays = [];
Expand Down
2 changes: 1 addition & 1 deletion src/plots/plots.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ plots.linkSubplots = function(newFullData, newFullLayout, oldFullData, oldFullLa
newSubplots = newFullLayout._plots = {};

var mockGd = {
data: newFullData,
_fullData: newFullData,
_fullLayout: newFullLayout
};

Expand Down
Binary file added test/image/baselines/dendrogram.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.
Loading