Histogram autobin

src/plots/plots.js

@@ -438,17 +438,17 @@ plots.supplyDefaults = function(gd, opts) {
     plots.supplyLayoutModuleDefaults(newLayout, newFullLayout, newFullData, gd._transitionData);
 
     // Special cases that introduce interactions between traces.
-    // This is after relinkPrivateKeys so we can use those in cleanData
+    // This is after relinkPrivateKeys so we can use those in crossTraceDefaults
     // and after layout module defaults, so we can use eg barmode
     var _modules = newFullLayout._visibleModules;
-    var cleanDataFuncs = [];
+    var crossTraceDefaultsFuncs = [];
     for(i = 0; i < _modules.length; i++) {
-        var _module = _modules[i];
-        // some trace types share cleanData (ie histogram2d, histogram2dcontour)
-        if(_module.cleanData) Lib.pushUnique(cleanDataFuncs, _module.cleanData);
+        var funci = _modules[i].crossTraceDefaults;
+        // some trace types share crossTraceDefaults (ie histogram2d, histogram2dcontour)
+        if(funci) Lib.pushUnique(crossTraceDefaultsFuncs, funci);
     }
-    for(i = 0; i < cleanDataFuncs.length; i++) {
-        cleanDataFuncs[i](newFullData, newFullLayout);
+    for(i = 0; i < crossTraceDefaultsFuncs.length; i++) {
+        crossTraceDefaultsFuncs[i](newFullData, newFullLayout);
     }
 
     // turn on flag to optimize large splom-only graphs

src/traces/histogram/clean_data.js → src/traces/histogram/cross_trace_defaults.js

@@ -30,7 +30,7 @@ var BINATTRS = {
 };
 
 // handle bin attrs and relink auto-determined values so fullData is complete
-module.exports = function cleanData(fullData, fullLayout) {
+module.exports = function crossTraceDefaults(fullData, fullLayout) {
     var allBinOpts = fullLayout._histogramBinOpts = {};
     var isOverlay = fullLayout.barmode === 'overlay';
     var i, j, traceOut, traceIn, binDirection, group, binOpts;

src/traces/histogram/defaults.js

@@ -52,7 +52,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
     if(hasAggregationData) coerce('histfunc');
     coerce('histnorm');
 
-    // Note: bin defaults are now handled in Histogram.cleanData
+    // Note: bin defaults are now handled in Histogram.crossTraceDefaults
     // autobin(x|y) are only included here to appease Plotly.validate
     coerce('autobin' + sampleLetter);
 

src/traces/histogram/index.js

@@ -28,7 +28,7 @@ var Histogram = {};
 Histogram.attributes = require('./attributes');
 Histogram.layoutAttributes = require('../bar/layout_attributes');
 Histogram.supplyDefaults = require('./defaults');
-Histogram.cleanData = require('./clean_data');
+Histogram.crossTraceDefaults = require('./cross_trace_defaults');
 Histogram.supplyLayoutDefaults = require('../bar/layout_defaults');
 Histogram.calc = require('./calc');
 Histogram.crossTraceCalc = require('../bar/cross_trace_calc').crossTraceCalc;

src/traces/histogram2d/clean_data.js → src/traces/histogram2d/cross_trace_defaults.js

@@ -23,7 +23,7 @@ var BINDIRECTIONS = ['x', 'y'];
 // Handle bin attrs and relink auto-determined values so fullData is complete
 // does not have cross-trace coupling, but moved out here so we have axis types
 // and relinked trace._autoBin
-module.exports = function cleanData(fullData, fullLayout) {
+module.exports = function crossTraceDefaults(fullData, fullLayout) {
     var i, j, traceOut, binDirection;
 
     function coerce(attr) {

src/traces/histogram2d/index.js

@@ -13,7 +13,7 @@ var Histogram2D = {};
 
 Histogram2D.attributes = require('./attributes');
 Histogram2D.supplyDefaults = require('./defaults');
-Histogram2D.cleanData = require('./clean_data');
+Histogram2D.crossTraceDefaults = require('./cross_trace_defaults');
 Histogram2D.calc = require('../heatmap/calc');
 Histogram2D.plot = require('../heatmap/plot');
 Histogram2D.layerName = 'heatmaplayer';

src/traces/histogram2d/sample_defaults.js

@@ -34,7 +34,7 @@ module.exports = function handleSampleDefaults(traceIn, traceOut, coerce, layout
     if(hasAggregationData) coerce('histfunc');
     coerce('histnorm');
 
-    // Note: bin defaults are now handled in Histogram2D.cleanData
+    // Note: bin defaults are now handled in Histogram2D.crossTraceDefaults
     // autobin(x|y) are only included here to appease Plotly.validate
     coerce('autobinx');
     coerce('autobiny');

src/traces/histogram2dcontour/index.js

@@ -13,7 +13,7 @@ var Histogram2dContour = {};
 
 Histogram2dContour.attributes = require('./attributes');
 Histogram2dContour.supplyDefaults = require('./defaults');
-Histogram2dContour.cleanData = require('../histogram2d/clean_data');
+Histogram2dContour.crossTraceDefaults = require('../histogram2d/cross_trace_defaults');
 Histogram2dContour.calc = require('../contour/calc');
 Histogram2dContour.plot = require('../contour/plot').plot;
 Histogram2dContour.layerName = 'contourlayer';

src/traces/scatter/clean_data.js → src/traces/scatter/cross_trace_defaults.js

@@ -11,7 +11,7 @@
 
 
 // remove opacity for any trace that has a fill or is filled to
-module.exports = function cleanData(fullData) {
+module.exports = function crossTraceDefaults(fullData) {
     for(var i = 0; i < fullData.length; i++) {
         var tracei = fullData[i];
         if(tracei.type !== 'scatter') continue;

src/traces/scatter/index.js

@@ -19,7 +19,7 @@ Scatter.isBubble = subtypes.isBubble;
 
 Scatter.attributes = require('./attributes');
 Scatter.supplyDefaults = require('./defaults');
-Scatter.cleanData = require('./clean_data');
+Scatter.crossTraceDefaults = require('./cross_trace_defaults');
 Scatter.calc = require('./calc').calc;
 Scatter.crossTraceCalc = require('./cross_trace_calc');
 Scatter.arraysToCalcdata = require('./arrays_to_calcdata');

src/traces/scattergl/index.js

@@ -952,7 +952,7 @@ module.exports = {
 
     attributes: require('./attributes'),
     supplyDefaults: require('./defaults'),
-    cleanData: require('../scatter/clean_data'),
+    crossTraceDefaults: require('../scatter/cross_trace_defaults'),
     colorbar: require('../scatter/marker_colorbar'),
     calc: calc,
     plot: plot,