rename setPositions -> crossTraceCalc

... and set_positions.js files -> cross_trace_calc.js

Author: etpinard

src/plots/plots.js

@@ -2576,7 +2576,7 @@ plots.doSetPositions = function(gd) {
 
     for(j = 0; j < modules.length; j++) {
         var _module = modules[j];
-        var fn = _module.setPositions;
+        var fn = _module.crossTraceCalc;
         if(fn) {
             var spType = _module.basePlotModule.name;
             if(hash[spType]) {

src/traces/bar/set_positions.js src/traces/bar/cross_trace_calc.jssrc/traces/bar/set_positions.js renamed to src/traces/bar/cross_trace_calc.js

@@ -24,7 +24,7 @@ var Sieve = require('./sieve.js');
  * now doing this one subplot at a time
  */
 
-module.exports = function setPositions(gd, plotinfo) {
+module.exports = function crossTraceCalc(gd, plotinfo) {
     var xa = plotinfo.xaxis,
         ya = plotinfo.yaxis;
 

src/traces/bar/index.js

@@ -16,7 +16,7 @@ Bar.layoutAttributes = require('./layout_attributes');
 Bar.supplyDefaults = require('./defaults');
 Bar.supplyLayoutDefaults = require('./layout_defaults');
 Bar.calc = require('./calc');
-Bar.setPositions = require('./set_positions');
+Bar.crossTraceCalc = require('./cross_trace_calc');
 Bar.colorbar = require('../scatter/marker_colorbar');
 Bar.arraysToCalcdata = require('./arrays_to_calcdata');
 Bar.plot = require('./plot');

src/traces/box/set_positions.js src/traces/box/cross_trace_calc.jssrc/traces/box/set_positions.js renamed to src/traces/box/cross_trace_calc.js

@@ -13,7 +13,7 @@ var Lib = require('../../lib');
 
 var orientations = ['v', 'h'];
 
-function setPositions(gd, plotinfo) {
+function crossTraceCalc(gd, plotinfo) {
     var calcdata = gd.calcdata;
     var xa = plotinfo.xaxis;
     var ya = plotinfo.yaxis;
@@ -109,6 +109,6 @@ function setPositionOffset(traceType, gd, boxList, posAxis, pad) {
 }
 
 module.exports = {
-    setPositions: setPositions,
+    crossTraceCalc: crossTraceCalc,
     setPositionOffset: setPositionOffset
 };

src/traces/box/index.js

@@ -15,7 +15,7 @@ Box.layoutAttributes = require('./layout_attributes');
 Box.supplyDefaults = require('./defaults').supplyDefaults;
 Box.supplyLayoutDefaults = require('./layout_defaults').supplyLayoutDefaults;
 Box.calc = require('./calc');
-Box.setPositions = require('./set_positions').setPositions;
+Box.crossTraceCalc = require('./cross_trace_calc').crossTraceCalc;
 Box.plot = require('./plot').plot;
 Box.style = require('./style').style;
 Box.styleOnSelect = require('./style').styleOnSelect;

src/traces/candlestick/index.js

@@ -32,7 +32,7 @@ module.exports = {
     attributes: require('./attributes'),
     layoutAttributes: require('../box/layout_attributes'),
     supplyLayoutDefaults: require('../box/layout_defaults').supplyLayoutDefaults,
-    setPositions: require('../box/set_positions').setPositions,
+    crossTraceCalc: require('../box/cross_trace_calc').crossTraceCalc,
     supplyDefaults: require('./defaults'),
     calc: require('./calc'),
     plot: require('../box/plot').plot,

src/traces/histogram/index.js

@@ -12,7 +12,7 @@
 /**
  * Histogram has its own attribute, defaults and calc steps,
  * but uses bar's plot to display
- * and bar's setPositions for stacking and grouping
+ * and bar's crossTraceCalc (formally known as setPositions) for stacking and grouping
  */
 
 /**
@@ -30,7 +30,7 @@ Histogram.layoutAttributes = require('../bar/layout_attributes');
 Histogram.supplyDefaults = require('./defaults');
 Histogram.supplyLayoutDefaults = require('../bar/layout_defaults');
 Histogram.calc = require('./calc');
-Histogram.setPositions = require('../bar/set_positions');
+Histogram.crossTraceCalc = require('../bar/cross_trace_calc');
 Histogram.plot = require('../bar/plot');
 Histogram.layerName = 'barlayer';
 Histogram.style = require('../bar/style').style;

src/traces/violin/set_positions.js src/traces/violin/cross_trace_calc.jssrc/traces/violin/set_positions.js renamed to src/traces/violin/cross_trace_calc.js

@@ -8,10 +8,10 @@
 
 'use strict';
 
-var setPositionOffset = require('../box/set_positions').setPositionOffset;
+var setPositionOffset = require('../box/cross_trace_calc').setPositionOffset;
 var orientations = ['v', 'h'];
 
-module.exports = function setPositions(gd, plotinfo) {
+module.exports = function crossTraceCalc(gd, plotinfo) {
     var calcdata = gd.calcdata;
     var xa = plotinfo.xaxis;
     var ya = plotinfo.yaxis;

src/traces/violin/index.js

@@ -14,7 +14,7 @@ module.exports = {
     supplyDefaults: require('./defaults'),
     supplyLayoutDefaults: require('./layout_defaults'),
     calc: require('./calc'),
-    setPositions: require('./set_positions'),
+    crossTraceCalc: require('./cross_trace_calc'),
     plot: require('./plot'),
     style: require('./style'),
     styleOnSelect: require('../scatter/style').styleOnSelect,

test/jasmine/tests/bar_test.js

@@ -171,7 +171,7 @@ describe('Bar.supplyDefaults', function() {
     });
 });
 
-describe('bar calc / setPositions', function() {
+describe('bar calc / crossTraceCalc (formally known as setPositions)', function() {
     'use strict';
 
     it('should fill in calc pt fields (stack case)', function() {
@@ -337,7 +337,7 @@ describe('Bar.calc', function() {
     });
 });
 
-describe('Bar.setPositions', function() {
+describe('Bar.crossTraceCalc (formally known as setPositions)', function() {
     'use strict';
 
     it('should guard against invalid offset items', function() {
@@ -1347,9 +1347,9 @@ describe('bar visibility toggling:', function() {
         expect(fullLayout.xaxis.range).toBeCloseToArray(xrng, 2, msg + ' xrng');
         expect(fullLayout.yaxis.range).toBeCloseToArray(yrng, 2, msg + ' yrng');
 
-        var setPositions = gd._fullData[0]._module.setPositions;
-        expect(setPositions).toHaveBeenCalledTimes(calls);
-        setPositions.calls.reset();
+        var crossTraceCalc = gd._fullData[0]._module.crossTraceCalc;
+        expect(crossTraceCalc).toHaveBeenCalledTimes(calls);
+        crossTraceCalc.calls.reset();
     }
 
     it('should update axis range according to visible edits (group case)', function(done) {
@@ -1358,7 +1358,7 @@ describe('bar visibility toggling:', function() {
             {type: 'bar', x: [1, 2, 3], y: [-1, -2, -1]}
         ])
         .then(function() {
-            spyOn(gd._fullData[0]._module, 'setPositions').and.callThrough();
+            spyOn(gd._fullData[0]._module, 'crossTraceCalc').and.callThrough();
 
             _assert('base', [0.5, 3.5], [-2.222, 2.222], 0);
             return Plotly.restyle(gd, 'visible', false, [1]);
@@ -1388,7 +1388,7 @@ describe('bar visibility toggling:', function() {
             {type: 'bar', x: [1, 2, 3], y: [2, 3, 2]}
         ], {barmode: 'stack'})
         .then(function() {
-            spyOn(gd._fullData[0]._module, 'setPositions').and.callThrough();
+            spyOn(gd._fullData[0]._module, 'crossTraceCalc').and.callThrough();
 
             _assert('base', [0.5, 3.5], [0, 5.263], 0);
             return Plotly.restyle(gd, 'visible', false, [1]);
@@ -1806,8 +1806,8 @@ function mockBarPlot(dataWithoutTraceType, layout) {
         yaxis: gd._fullLayout.yaxis
     };
 
-    // call Bar.setPositions
-    Bar.setPositions(gd, plotinfo);
+    // call Bar.crossTraceCalc
+    Bar.crossTraceCalc(gd, plotinfo);
 
     return gd;
 }