move scatter / bar .arrayToCalcDdata from .plot to .calc

etpinard · etpinard · commit b9db53302546 · 2016-12-16T12:22:49.000-05:00
- making calc-transforms behave as desired on relayout (e.g. zoom)
- this should also be a perf boost as trace array to calcdata
  is now called only in the calc as-opposed to the plot step
  (which is called more often e.g. on zoom)
diff --git a/src/plot_api/subroutines.js b/src/plot_api/subroutines.js
@@ -236,7 +236,7 @@ exports.doTraceStyle = function(gd) {
             _module = ((cdi[0] || {}).trace || {})._module || {},
             arraysToCalcdata = _module.arraysToCalcdata;
 
-        if(arraysToCalcdata) arraysToCalcdata(cdi);
+        if(arraysToCalcdata) arraysToCalcdata(cdi, cdi[0].trace);
     }
 
     Plots.style(gd);
diff --git a/src/traces/bar/arrays_to_calcdata.js b/src/traces/bar/arrays_to_calcdata.js
@@ -13,18 +13,18 @@ var mergeArray = require('../../lib').mergeArray;
 
 
 // arrayOk attributes, merge them into calcdata array
-module.exports = function arraysToCalcdata(cd) {
-    var trace = cd[0].trace,
-        marker = trace.marker;
-
+module.exports = function arraysToCalcdata(cd, trace) {
     mergeArray(trace.text, cd, 'tx');
 
-    if(marker && marker.line) {
-        var markerLine = marker.line;
-
+    var marker = trace.marker;
+    if(marker) {
         mergeArray(marker.opacity, cd, 'mo');
         mergeArray(marker.color, cd, 'mc');
-        mergeArray(markerLine.color, cd, 'mlc');
-        mergeArray(markerLine.width, cd, 'mlw');
+
+        var markerLine = marker.line;
+        if(markerLine) {
+            mergeArray(markerLine.color, cd, 'mlc');
+            mergeArray(markerLine.width, cd, 'mlw');
+        }
     }
 };
diff --git a/src/traces/bar/calc.js b/src/traces/bar/calc.js
@@ -15,6 +15,8 @@ var Axes = require('../../plots/cartesian/axes');
 var hasColorscale = require('../../components/colorscale/has_colorscale');
 var colorscaleCalc = require('../../components/colorscale/calc');
 
+var arraysToCalcdata = require('./arrays_to_calcdata');
+
 
 module.exports = function calc(gd, trace) {
     // depending on bar direction, set position and size axes
@@ -97,5 +99,7 @@ module.exports = function calc(gd, trace) {
         colorscaleCalc(trace, trace.marker.line.color, 'marker.line', 'c');
     }
 
+    arraysToCalcdata(cd, trace);
+
     return cd;
 };
diff --git a/src/traces/bar/plot.js b/src/traces/bar/plot.js
@@ -20,8 +20,6 @@ var Color = require('../../components/color');
 var Drawing = require('../../components/drawing');
 var ErrorBars = require('../../components/errorbars');
 
-var arraysToCalcdata = require('./arrays_to_calcdata');
-
 var attributes = require('./attributes'),
     attributeText = attributes.text,
     attributeTextPosition = attributes.textposition,
@@ -53,8 +51,6 @@ module.exports = function plot(gd, plotinfo, cdbar) {
                 barwidth = t.barwidth,
                 barwidthIsArray = Array.isArray(barwidth);
 
-            arraysToCalcdata(d);
-
             d3.select(this).selectAll('g.point')
                 .data(Lib.identity)
               .enter().append('g').classed('point', true)
diff --git a/src/traces/scatter/arrays_to_calcdata.js b/src/traces/scatter/arrays_to_calcdata.js
@@ -13,9 +13,7 @@ var Lib = require('../../lib');
 
 
 // arrayOk attributes, merge them into calcdata array
-module.exports = function arraysToCalcdata(cd) {
-    var trace = cd[0].trace,
-        marker = trace.marker;
+module.exports = function arraysToCalcdata(cd, trace) {
 
     Lib.mergeArray(trace.text, cd, 'tx');
     Lib.mergeArray(trace.textposition, cd, 'tp');
@@ -25,12 +23,17 @@ module.exports = function arraysToCalcdata(cd) {
         Lib.mergeArray(trace.textfont.family, cd, 'tf');
     }
 
-    if(marker && marker.line) {
-        var markerLine = marker.line;
+    var marker = trace.marker;
+    if(marker) {
+        Lib.mergeArray(marker.size, cd, 'ms');
         Lib.mergeArray(marker.opacity, cd, 'mo');
         Lib.mergeArray(marker.symbol, cd, 'mx');
         Lib.mergeArray(marker.color, cd, 'mc');
-        Lib.mergeArray(markerLine.color, cd, 'mlc');
-        Lib.mergeArray(markerLine.width, cd, 'mlw');
+
+        var markerLine = marker.line;
+        if(marker.line) {
+            Lib.mergeArray(markerLine.color, cd, 'mlc');
+            Lib.mergeArray(markerLine.width, cd, 'mlw');
+        }
     }
 };
diff --git a/src/traces/scatter/calc.js b/src/traces/scatter/calc.js
@@ -12,10 +12,10 @@
 var isNumeric = require('fast-isnumeric');
 
 var Axes = require('../../plots/cartesian/axes');
-var Lib = require('../../lib');
 
 var subTypes = require('./subtypes');
 var calcColorscale = require('./colorscale_calc');
+var arraysToCalcdata = require('./arrays_to_calcdata');
 
 
 module.exports = function calc(gd, trace) {
@@ -121,8 +121,7 @@ module.exports = function calc(gd, trace) {
         }
     }
 
-    // this has migrated up from arraysToCalcdata as we have a reference to 's' here
-    if(typeof s !== 'undefined') Lib.mergeArray(s, cd, 'ms');
+    arraysToCalcdata(cd, trace);
 
     gd.firstscatter = false;
     return cd;
diff --git a/src/traces/scatter/plot.js b/src/traces/scatter/plot.js
@@ -16,7 +16,6 @@ var Drawing = require('../../components/drawing');
 var ErrorBars = require('../../components/errorbars');
 
 var subTypes = require('./subtypes');
-var arraysToCalcdata = require('./arrays_to_calcdata');
 var linePoints = require('./line_points');
 var linkTraces = require('./link_traces');
 var polygonTester = require('../../lib/polygon').tester;
@@ -179,8 +178,6 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
     // store node for tweaking by selectPoints
     cdscatter[0].node3 = tr;
 
-    arraysToCalcdata(cdscatter);
-
     var prevRevpath = '';
     var prevPolygons = [];
     var prevtrace = trace._prevtrace;
diff --git a/src/traces/scatter3d/calc.js b/src/traces/scatter3d/calc.js
@@ -20,7 +20,7 @@ var calcColorscales = require('../scatter/colorscale_calc');
 module.exports = function calc(gd, trace) {
     var cd = [{x: false, y: false, trace: trace, t: {}}];
 
-    arraysToCalcdata(cd);
+    arraysToCalcdata(cd, trace);
     calcColorscales(trace);
 
     return cd;
diff --git a/src/traces/scatterternary/calc.js b/src/traces/scatterternary/calc.js
@@ -12,10 +12,10 @@
 var isNumeric = require('fast-isnumeric');
 
 var Axes = require('../../plots/cartesian/axes');
-var Lib = require('../../lib');
 
 var subTypes = require('../scatter/subtypes');
 var calcColorscale = require('../scatter/colorscale_calc');
+var arraysToCalcdata = require('../scatter/arrays_to_calcdata');
 
 var dataArrays = ['a', 'b', 'c'];
 var arraysToFill = {a: ['b', 'c'], b: ['a', 'c'], c: ['a', 'b']};
@@ -89,9 +89,7 @@ module.exports = function calc(gd, trace) {
     }
 
     calcColorscale(trace);
-
-    // this has migrated up from arraysToCalcdata as we have a reference to 's' here
-    if(typeof s !== 'undefined') Lib.mergeArray(s, cd, 'ms');
+    arraysToCalcdata(cd, trace);
 
     return cd;
 };

Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@ exports.doTraceStyle = function(gd) {`
`236`	`236`	`_module = ((cdi[0] \|\| {}).trace \|\| {})._module \|\| {},`
`237`	`237`	`arraysToCalcdata = _module.arraysToCalcdata;`
`238`	`238`
`239`		`- if(arraysToCalcdata) arraysToCalcdata(cdi);`
	`239`	`+ if(arraysToCalcdata) arraysToCalcdata(cdi, cdi[0].trace);`
`240`	`240`	`}`
`241`	`241`
`242`	`242`	`Plots.style(gd);`