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

Clean subplots #2227

Merged
merged 17 commits into from
Jan 3, 2018
Merged

Clean subplots #2227

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
687a2e2
refactor calcdata filtering
alexcjohnson Nov 3, 2017
9a18062
perf xaCheater/xaNonCheater test in cartesian axes defaults
alexcjohnson Nov 4, 2017
2c9d90f
lint cartesian layout_defaults
alexcjohnson Nov 4, 2017
3625be4
rework subplot logic - create subplots from traces and components only
alexcjohnson Nov 22, 2017
2de217e
update baselines for improved subplot logic
alexcjohnson Dec 29, 2017
b94ad8e
wider acceptance range for png toimage test
alexcjohnson Dec 29, 2017
c88e8c2
update trans keys
alexcjohnson Dec 22, 2017
26aaffc
fix typo in cameraposition -> camera cleaning
alexcjohnson Nov 30, 2017
276d1d3
updated gl3d "cameraposition" baselines
alexcjohnson Dec 29, 2017
c49007e
:hocho: unused import
alexcjohnson Dec 29, 2017
698561c
:hocho: commented out code
alexcjohnson Dec 30, 2017
8804311
Object.keys -> for in, in plots/plots
alexcjohnson Dec 30, 2017
4786b6e
simplify redundant title removal
alexcjohnson Dec 30, 2017
6e62b35
get rid of unneeded _has(gl2d)
alexcjohnson Dec 30, 2017
0506f88
use _subplots in Axes.list/listIds
alexcjohnson Dec 30, 2017
2aa1545
simplify and speed up a few Axes.list uses
alexcjohnson Dec 30, 2017
44060db
fix annotation calc_autorange change
alexcjohnson Dec 30, 2017
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
10 changes: 5 additions & 5 deletions src/plots/cartesian/layout_defaults.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
yaListCartesian = [],
xaListGl2d = [],
yaListGl2d = [],
xaListCheater = [],
xaListNonCheater = [],
xaCheater = {},
xaNonCheater = {},
Copy link
Contributor

Choose a reason for hiding this comment

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

Nice 🐎

outerTicks = {},
noGrids = {},
i;
Expand All @@ -57,15 +57,15 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
// 1. is not carpet
// 2. carpet that's not cheater
if(!Registry.traceIs(trace, 'carpet') || (trace.type === 'carpet' && !trace._cheater)) {
if(xaName) Lib.pushUnique(xaListNonCheater, xaName);
if(xaName) xaNonCheater[xaName] = 1;
}

// The above check for definitely-not-cheater is not adequate. This
// second list tracks which axes *could* be a cheater so that the
// full condition triggering hiding is:
// *could* be a cheater and *is not definitely visible*
if(trace.type === 'carpet' && trace._cheater) {
if(xaName) Lib.pushUnique(xaListCheater, xaName);
if(xaName) xaCheater[xaName] = 1;
}

// add axes implied by traces
Expand Down Expand Up @@ -186,7 +186,7 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
data: fullData,
bgColor: bgColor,
calendar: layoutOut.calendar,
cheateronly: axLetter === 'x' && (xaListCheater.indexOf(axName) !== -1 && xaListNonCheater.indexOf(axName) === -1)
cheateronly: axLetter === 'x' && (xaCheater[axName] && !xaNonCheater[axName])
};

handleAxisDefaults(axLayoutIn, axLayoutOut, coerce, defaultOptions, layoutOut);
Expand Down