Introducing transform plugins #499
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,7 +21,8 @@ var plots = module.exports = {}; | |
| var modules = plots.modules = {}, | ||
| allTypes = plots.allTypes = [], | ||
| allCategories = plots.allCategories = {}, | ||
| subplotsRegistry = plots.subplotsRegistry = {}, | ||
| transformsRegistry = plots.transformsRegistry = {}; | ||
|
|
||
| plots.attributes = require('./attributes'); | ||
| plots.attributes.type.values = allTypes; | ||
|
|
@@ -449,8 +450,7 @@ plots.supplyDefaults = function(gd) { | |
| newData = gd.data || [], | ||
| modules = gd._modules = []; | ||
|
|
||
| var i, trace, _module, axList, ax; | ||
|
|
||
| // first fill in what we can of layout without looking at data | ||
| // because fullData needs a few things from layout | ||
|
|
@@ -460,24 +460,7 @@ plots.supplyDefaults = function(gd) { | |
| newFullLayout._dataLength = newData.length; | ||
|
|
||
| // then do the data | ||
| plots.supplyDataDefaults(newData, newFullData, newFullLayout, modules); | ||
|
|
||
| // special cases that introduce interactions between traces | ||
| for(i = 0; i < modules.length; i++) { | ||
|
|
@@ -609,7 +592,61 @@ function relinkPrivateKeys(toLayout, fromLayout) { | |
| } | ||
| } | ||
|
|
||
| plots.supplyDataDefaults = function(dataIn, dataOut, layout, modules) { | ||
| var cnt = 0; | ||
|
|
||
| // push to array if item isn't already in array | ||
| function fill(arr, item) { | ||
| if(item && arr.indexOf(item) === -1) return arr.push(item); | ||
| } | ||
|
|
||
| // detect plot type | ||
| function detect(trace) { | ||
| if(plots.traceIs(trace, 'cartesian')) layout._hasCartesian = true; | ||
| else if(plots.traceIs(trace, 'gl3d')) layout._hasGL3D = true; | ||
| else if(plots.traceIs(trace, 'geo')) layout._hasGeo = true; | ||
| else if(plots.traceIs(trace, 'pie')) layout._hasPie = true; | ||
| else if(plots.traceIs(trace, 'gl2d')) layout._hasGL2D = true; | ||
| else if(plots.traceIs(trace, 'ternary')) layout._hasTernary = true; | ||
| else if('r' in trace) layout._hasPolar = true; | ||
| } | ||
|
|
||
| for(var i = 0; i < dataIn.length; i++) { | ||
| var trace = dataIn[i]; | ||
|
|
||
| var fullTrace = plots.supplyTraceDefaults(trace, cnt, layout); | ||
|
|
||
| // keep track of pre-transform _input | ||
| var traceIn = fullTrace._input; | ||
|
|
||
| if(fullTrace.transforms && fullTrace.transforms.length) { | ||
| var expandedTraces = applyTransforms(fullTrace, dataOut, layout); | ||
|
|
||
| for(var j = 0; j < expandedTraces.length; j++) { | ||
| var expandedTrace = expandedTraces[j]; | ||
| var fullExpandedTrace = plots.supplyTraceDefaults(expandedTrace, cnt, layout); | ||
|
|
||
| // copy refs | ||
| fullExpandedTrace._input = traceIn; | ||
| fullExpandedTrace._fullTransforms = fullTrace.transforms; | ||
| fullExpandedTrace._index = i; | ||
|
There was a problem hiding this comment. not sure what we need There was a problem hiding this comment.
We need it to set the There was a problem hiding this comment.
Good call. I like the sound of There was a problem hiding this comment. If ok, I would not rename |
||
|
|
||
| dataOut.push(fullExpandedTrace); | ||
| fill(modules, fullExpandedTrace._module); | ||
| detect(fullExpandedTrace); | ||
| cnt++; | ||
| } | ||
| } | ||
| else { | ||
| dataOut.push(fullTrace); | ||
| fill(modules, fullTrace._module); | ||
| detect(trace); | ||
|
There was a problem hiding this comment. in fact, this untransformed case needs function addFinalTrace(finalTrace) {
finalTrace._input = trace;
finalTrace._inputIndex = i;
finalTrace._expandedIndex = cnt;
dataOut.push(finalTrace);
fill(modules, finalTrace);
detect(finalTrace);
cnt++;
}since all of that needs to happen identically whichever way you added a trace to There was a problem hiding this comment. Good catch ⚾ . Thanks! |
||
| cnt++; | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| plots.supplyTraceDefaults = function(traceIn, i, layout) { | ||
| var traceOut = {}, | ||
| defaultColor = Color.defaults[i % Color.defaults.length]; | ||
|
|
||
|
|
@@ -666,6 +703,8 @@ plots.supplyDataDefaults = function(traceIn, i, layout) { | |
| coerce('showlegend'); | ||
| coerce('legendgroup'); | ||
| } | ||
|
|
||
| supplyTransformDefaults(traceIn, traceOut, layout); | ||
| } | ||
|
|
||
| // NOTE: I didn't include fit info at all... for now I think it can stay | ||
|
|
@@ -678,6 +717,42 @@ plots.supplyDataDefaults = function(traceIn, i, layout) { | |
| return traceOut; | ||
| }; | ||
|
|
||
| function supplyTransformDefaults(traceIn, traceOut, layout) { | ||
| var containerIn = traceIn.transforms || [], | ||
| containerOut = traceOut.transforms = []; | ||
|
There was a problem hiding this comment. I think this line here ensures that every fullTrace will now have a transforms array? Most of the time it will be empty. Some tests that have nothing to do with transforms are failing due to an empty transforms array appearing. I think this is the culprit. There was a problem hiding this comment. No problem. I can remove it. There was a problem hiding this comment. just verified. if(!Array.isArray(traceIn.transforms)) {
return;
}at the top of this function remedies the issue. Though perhaps this breaks other things. Not sure. |
||
|
|
||
| for(var i = 0; i < containerIn.length; i++) { | ||
| var transformIn = containerIn[i], | ||
| type = transformIn.type, | ||
| _module = transformsRegistry[type]; | ||
|
|
||
| var transformOut = _module.supplyDefaults(transformIn, traceOut, layout); | ||
| transformOut.type = type; | ||
|
|
||
| containerOut.push(transformOut); | ||
| } | ||
| } | ||
|
|
||
| function applyTransforms(fullTrace, fullData, layout) { | ||
| var container = fullTrace.transforms, | ||
| dataOut = [fullTrace]; | ||
|
|
||
| for(var i = 0; i < container.length; i++) { | ||
| var transform = container[i], | ||
| type = transform.type, | ||
| _module = transformsRegistry[type]; | ||
|
|
||
| dataOut = _module.transform(dataOut, { | ||
| transform: transform, | ||
| fullTrace: fullTrace, | ||
| fullData: fullData, | ||
| layout: layout | ||
| }); | ||
| } | ||
|
|
||
| return dataOut; | ||
| } | ||
|
|
||
| plots.supplyLayoutGlobalDefaults = function(layoutIn, layoutOut) { | ||
| function coerce(attr, dflt) { | ||
| return Lib.coerce(layoutIn, layoutOut, plots.layoutAttributes, attr, dflt); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
isn't this just
trace?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Correct. Thanks for checking.