Skip to content

Implementing matching axes #3506

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 23 commits into from
Feb 18, 2019
Merged

Implementing matching axes #3506

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
6813865
mv handleConstraintDefaults into constraints.js file
etpinard Jan 24, 2019
6f2bb78
first cut at static `ax.matches` behavior
etpinard Jan 23, 2019
5ddbf2a
some linting & commenting in dragbox.js
etpinard Feb 1, 2019
c60424b
first cut at zoom/pan/scroll `ax.matches` behavior
etpinard Feb 1, 2019
13007e0
add doScroll wrapper for dragbox tests
etpinard Jan 31, 2019
e962e96
mv dragbox tests calling makePlot to own describe block
etpinard Jan 31, 2019
ca1de5d
DRY-up drag-start/assert/drag-end tests
etpinard Jan 31, 2019
3b314fe
add toBeWithinArray custom jasmine matcher
etpinard Feb 1, 2019
6621419
add mucho matching axes dragbox tests
etpinard Jan 29, 2019
9118505
align autobinning of histogram traces on matching axes
etpinard Jan 28, 2019
d9c2d4e
link ax._categories & ax._categoriesMap to same ref for matching axes
etpinard Jan 28, 2019
c290adf
add axis.matches boolean to splom dims
etpinard Feb 1, 2019
ef256db
generalize "update matched ax rng" logic
etpinard Feb 1, 2019
9f2fad1
disallow constraining AND matching range
etpinard Feb 1, 2019
8c09944
add "matches" + "scaleanchor" mock
etpinard Feb 1, 2019
c5f9e74
fix partial ax-range relayout calls for matching axes
etpinard Feb 1, 2019
d0581e2
fix typo (ax.setScale has no arg)
etpinard Feb 5, 2019
6b34ae3
use ax._matchGroup to improve matching axes relayout perf
etpinard Feb 5, 2019
99a9edb
allow fixedrange subplots to scaleanchor with `constrain:domain`
etpinard Feb 6, 2019
91431ec
drop *scaleanchor* constraints for axes under *matches* constraint
etpinard Feb 12, 2019
70b10ff
add safe-guard in dragbox.js
etpinard Feb 18, 2019
772efe5
add info about matching axis type in attr description
etpinard Feb 18, 2019
1713c83
fix typo
etpinard Feb 18, 2019
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
21 changes: 16 additions & 5 deletions src/traces/histogram/cross_trace_defaults.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,16 @@ module.exports = function crossTraceDefaults(fullData, fullLayout) {
binDirection = traceOut.orientation === 'v' ? 'x' : 'y';
// in overlay mode make a separate group for each trace
// otherwise collect all traces of the same subplot & orientation
group = isOverlay ? traceOut.uid : (traceOut.xaxis + traceOut.yaxis + binDirection);
traceOut._groupName = group;

group = traceOut._groupName = isOverlay ? traceOut.uid : (
getAxisGroup(fullLayout, traceOut.xaxis) +
getAxisGroup(fullLayout, traceOut.yaxis) +
Copy link
Contributor Author

Choose a reason for hiding this comment

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

N.B. currently, both x and y need to match in order to be considered in the same auto-bin group.

binDirection
);
binOpts = allBinOpts[group];

if(binOpts) {
binOpts.traces.push(traceOut);
}
else {
} else {
binOpts = allBinOpts[group] = {
traces: [traceOut],
direction: binDirection
Expand Down Expand Up @@ -110,3 +111,13 @@ module.exports = function crossTraceDefaults(fullData, fullLayout) {
}
}
};

function getAxisGroup(fullLayout, axId) {
var matchGroups = fullLayout._axisMatchGroups;

for(var i = 0; i < matchGroups.length; i++) {
var group = matchGroups[i];
if(group[axId]) return 'g' + i;
}
return axId;
}
Binary file added test/image/baselines/hists-on-matching-axes.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.
84 changes: 84 additions & 0 deletions test/image/mocks/hists-on-matching-axes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
{
"data": [
{
"type": "histogram",
"name": "sample A - <b>matched</b>",
"x": [1, 2, 3, 1, 1, 2, 3, 3],
"hoverlabel": {
"namelength": -1
}
},
{
"type": "histogram",
"name": "sample B - <b>matched</b>",
"x": [2.1, 2.1, 3.4, 1.3, 2.2, 2.1, 3.2, 4.1, 3.1],
"hoverlabel": {
"namelength": -1
},
"xaxis": "x2",
"yaxis": "y2"
},
{
"type": "histogram",
"name": "sample A - <b>not</b> on matching axes",
"x": [1, 2, 3, 1, 1, 2, 3, 3],
"hoverlabel": {
"namelength": -1
},
"xaxis": "x3",
"yaxis": "y3"
},
{
"type": "histogram",
"name": "sample B - <b>not</b> on matching axes",
"x": [2.1, 2.1, 3.4, 1.3, 2.2, 2.1, 3.2, 4.1, 3.1],
"hoverlabel": {
"namelength": -1
},
"xaxis": "x4",
"yaxis": "y4"
}
],
"layout": {
"margin": {"t": 20, "b": 20},
"showlegend": false,
"xaxis": {
"domain": [0, 0.4]
},
"yaxis": {
"domain": [0.45, 1],
"title": {
"text": "Matched Axes"
}
},
"xaxis2": {
"domain": [0.45, 1],
"anchor": "y2",
"matches": "x"
},
"yaxis2": {
"domain": [0.45, 1],
"anchor": "x2",
"matches": "y"
},
"xaxis3": {
"domain": [0, 0.4],
"anchor": "y3"
},
"yaxis3": {
"domain": [0, 0.4],
"anchor": "x3",
"title": {
"text": "<b>NOT</b> Matched Axes"
}
},
"xaxis4": {
"domain": [0.45, 1],
"anchor": "y4"
},
"yaxis4": {
"domain": [0, 0.4],
"anchor": "x4"
}
}
}