Skip to content

Clean subplots #2227

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 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
Prev Previous commit
Next Next commit
Object.keys -> for in, in plots/plots
  • Loading branch information
@alexcjohnson
alexcjohnson committed Dec 30, 2017
commit 880431118c0a1ea6458907ce95861e8a7c70b441
51 changes: 18 additions & 33 deletions src/plots/plots.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,10 +436,8 @@ function emptySubplotLists() {
collectableSubplotTypes = [];

var subplotsRegistry = Registry.subplotsRegistry;
var subplotTypes = Object.keys(subplotsRegistry);

for(i = 0; i < subplotTypes.length; i++) {
var subplotType = subplotTypes[i];
for(var subplotType in subplotsRegistry) {
var subplotModule = subplotsRegistry[subplotType];
var subplotAttr = subplotModule.attr;

Expand Down Expand Up @@ -690,9 +688,8 @@ plots.linkSubplots = function(newFullData, newFullLayout, oldFullData, oldFullLa
var i, j, id, ax;

// sort subplot lists
var subplotTypes = Object.keys(newSubplotList);
for(i = 0; i < subplotTypes.length; i++) {
newSubplotList[subplotTypes[i]].sort(Lib.subplotSort);
for(var subplotType in newSubplotList) {
newSubplotList[subplotType].sort(Lib.subplotSort);
}

for(i = 0; i < ids.length; i++) {
Expand Down Expand Up @@ -1368,16 +1365,16 @@ function calculateReservedMargins(margins) {
}

plots.supplyLayoutModuleDefaults = function(layoutIn, layoutOut, fullData, transitionData) {
var components = Object.keys(Registry.componentsRegistry);
var componentsRegistry = Registry.componentsRegistry;
var basePlotModules = layoutOut._basePlotModules;
var i, _module;
var component, i, _module;

var Cartesian = Registry.subplotsRegistry.cartesian;

// check if any components need to add more base plot modules
// that weren't captured by traces
for(i = 0; i < components.length; i++) {
_module = Registry.componentsRegistry[components[i]];
for(component in componentsRegistry) {
_module = componentsRegistry[component];

if(_module.includeBasePlot) {
_module.includeBasePlot(layoutIn, layoutOut);
Copy link
Contributor

Choose a reason for hiding this comment

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

Nicely done here.

Expand Down Expand Up @@ -1424,8 +1421,8 @@ plots.supplyLayoutModuleDefaults = function(layoutIn, layoutOut, fullData, trans
}
}

for(i = 0; i < components.length; i++) {
_module = Registry.componentsRegistry[components[i]];
for(component in componentsRegistry) {
_module = componentsRegistry[component];

if(_module.supplyLayoutDefaults) {
_module.supplyLayoutDefaults(layoutIn, layoutOut, fullData);
Expand Down Expand Up @@ -1609,10 +1606,7 @@ plots.doAutoMargin = function(gd) {
// now cycle through all the combinations of l and r
// (and t and b) to find the required margins

var pmKeys = Object.keys(pm);

for(var i = 0; i < pmKeys.length; i++) {
var k1 = pmKeys[i];
for(var k1 in pm) {

var pushleft = pm[k1].l || {},
pushbottom = pm[k1].b || {},
Expand All @@ -1621,9 +1615,7 @@ plots.doAutoMargin = function(gd) {
fb = pushbottom.val,
pb = pushbottom.size;

for(var j = 0; j < pmKeys.length; j++) {
var k2 = pmKeys[j];

for(var k2 in pm) {
if(isNumeric(pl) && pm[k2].r) {
var fr = pm[k2].r.val,
pr = pm[k2].r.size;
Expand Down Expand Up @@ -2472,31 +2464,24 @@ plots.generalUpdatePerTraceModule = function(subplot, subplotCalcData, subplotLa
}
}

var moduleNamesOld = Object.keys(traceHashOld);
var moduleNames = Object.keys(traceHash);

// when a trace gets deleted, make sure that its module's
// plot method is called so that it is properly
// removed from the DOM.
for(i = 0; i < moduleNamesOld.length; i++) {
var moduleName = moduleNamesOld[i];
for(var moduleNameOld in traceHashOld) {

if(moduleNames.indexOf(moduleName) === -1) {
var fakeCalcTrace = traceHashOld[moduleName][0],
if(!traceHash[moduleNameOld]) {
var fakeCalcTrace = traceHashOld[moduleNameOld][0],
fakeTrace = fakeCalcTrace[0].trace;

fakeTrace.visible = false;
traceHash[moduleName] = [fakeCalcTrace];
traceHash[moduleNameOld] = [fakeCalcTrace];
}
}

// update list of module names to include 'fake' traces added above
moduleNames = Object.keys(traceHash);

// call module plot method
for(i = 0; i < moduleNames.length; i++) {
var moduleCalcData = traceHash[moduleNames[i]],
_module = moduleCalcData[0][0].trace._module;
for(var moduleName in traceHash) {
var moduleCalcData = traceHash[moduleName];
var _module = moduleCalcData[0][0].trace._module;

_module.plot(subplot, filterVisible(moduleCalcData), subplotLayout);
}
Expand Down