Skip to content

Commit 87275af

Browse files
etpinardetpinard
committed
use errorbars methods via getComponentMethod
... so that down the road errorbars could be taken out or src/core.js, and be its own registrable module.
1 parent b08c402 commit 87275af

File tree

15 files changed

+28
-33
lines changed

15 files changed

+28
-33
lines changed

‎src/plot_api/plot_api.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ var initInteractions = require('../plots/cartesian/graph_interact');
2727

2828
var Drawing = require('../components/drawing');
2929
var Color = require('../components/color');
30-
var ErrorBars = require('../components/errorbars');
3130
var xmlnsNamespaces = require('../constants/xmlns_namespaces');
3231
var svgTextUtils = require('../lib/svg_text_utils');
3332

@@ -312,7 +311,7 @@ Plotly.plot = function(gd, data, layout, config) {
312311
}
313312

314313
// calc and autorange for errorbars
315-
ErrorBars.calc(gd);
314+
Registry.getComponentMethod('errorbars', 'calc')(gd);
316315

317316
// TODO: autosize extra for text markers and images
318317
// see https://github.com/plotly/plotly.js/issues/1111

‎src/plots/plots.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ plots.fontWeight = 'normal';
4242

4343
var transformsRegistry = plots.transformsRegistry;
4444

45-
var ErrorBars = require('../components/errorbars');
46-
4745
var commandModule = require('./command');
4846
plots.executeAPICommand = commandModule.executeAPICommand;
4947
plots.computeAPICommandBindings = commandModule.computeAPICommandBindings;
@@ -2118,7 +2116,7 @@ plots.transition = function(gd, data, layout, traces, frameOpts, transitionOpts)
21182116

21192117
plots.doCalcdata(gd);
21202118

2121-
ErrorBars.calc(gd);
2119+
Registry.getComponentMethod('errorbars', 'calc')(gd);
21222120

21232121
return Promise.resolve();
21242122
}

‎src/traces/bar/defaults.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111

1212
var Lib = require('../../lib');
1313
var Color = require('../../components/color');
14+
var Registry = require('../../registry');
1415

1516
var handleXYDefaults = require('../scatter/xy_defaults');
1617
var handleStyleDefaults = require('../bar/style_defaults');
17-
var errorBarsSupplyDefaults = require('../../components/errorbars/defaults');
1818
var attributes = require('./attributes');
1919

2020
module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
@@ -57,6 +57,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
5757
handleStyleDefaults(traceIn, traceOut, coerce, defaultColor, layout);
5858

5959
// override defaultColor for error bars with defaultLine
60+
var errorBarsSupplyDefaults = Registry.getComponentMethod('errorbars', 'supplyDefaults');
6061
errorBarsSupplyDefaults(traceIn, traceOut, Color.defaultLine, {axis: 'y'});
6162
errorBarsSupplyDefaults(traceIn, traceOut, Color.defaultLine, {axis: 'x', inherit: 'y'});
6263

‎src/traces/bar/hover.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
'use strict';
1111

1212
var Fx = require('../../components/fx');
13-
var ErrorBars = require('../../components/errorbars');
13+
var Registry = require('../../registry');
1414
var Color = require('../../components/color');
1515
var fillHoverText = require('../scatter/fill_hover_text');
1616

@@ -140,7 +140,7 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode) {
140140
pointData[posLetter + 'Spike'] = pa.c2p(di.p, true);
141141

142142
fillHoverText(di, trace, pointData);
143-
ErrorBars.hoverInfo(di, trace, pointData);
143+
Registry.getComponentMethod('errorbars', 'hoverInfo')(di, trace, pointData);
144144

145145
return [pointData];
146146
};

‎src/traces/bar/plot.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ var svgTextUtils = require('../../lib/svg_text_utils');
1818

1919
var Color = require('../../components/color');
2020
var Drawing = require('../../components/drawing');
21-
var ErrorBars = require('../../components/errorbars');
21+
var Registry = require('../../registry');
2222

2323
var attributes = require('./attributes'),
2424
attributeText = attributes.text,
@@ -150,7 +150,7 @@ module.exports = function plot(gd, plotinfo, cdbar) {
150150
});
151151

152152
// error bars are on the top
153-
bartraces.call(ErrorBars.plot, plotinfo);
153+
Registry.getComponentMethod('errorbars', 'plot')(bartraces, plotinfo);
154154

155155
// lastly, clip points groups of `cliponaxis !== false` traces
156156
// on `plotinfo._hasClipOnAxisFalse === true` subplots

‎src/traces/bar/style.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
var d3 = require('d3');
1313
var Drawing = require('../../components/drawing');
14-
var ErrorBars = require('../../components/errorbars');
14+
var Registry = require('../../registry');
1515

1616
module.exports = function style(gd, cd) {
1717
var s = cd ? cd[0].node3 : d3.select(gd).selectAll('g.trace.bars');
@@ -64,5 +64,5 @@ module.exports = function style(gd, cd) {
6464
Drawing.selectedTextStyle(txs, trace);
6565
});
6666

67-
ErrorBars.style(s);
67+
Registry.getComponentMethod('errorbars', 'style')(s);
6868
};

‎src/traces/histogram/defaults.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ var Color = require('../../components/color');
1515

1616
var handleBinDefaults = require('./bin_defaults');
1717
var handleStyleDefaults = require('../bar/style_defaults');
18-
var errorBarsSupplyDefaults = require('../../components/errorbars/defaults');
1918
var attributes = require('./attributes');
2019

2120
module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
@@ -54,6 +53,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
5453
handleStyleDefaults(traceIn, traceOut, coerce, defaultColor, layout);
5554

5655
// override defaultColor for error bars with defaultLine
56+
var errorBarsSupplyDefaults = Registry.getComponentMethod('errorbars', 'supplyDefaults');
5757
errorBarsSupplyDefaults(traceIn, traceOut, Color.defaultLine, {axis: 'y'});
5858
errorBarsSupplyDefaults(traceIn, traceOut, Color.defaultLine, {axis: 'x', inherit: 'y'});
5959

‎src/traces/scatter/defaults.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
* LICENSE file in the root directory of this source tree.
77
*/
88

9-
109
'use strict';
1110

1211
var Lib = require('../../lib');
12+
var Registry = require('../../registry');
1313

1414
var attributes = require('./attributes');
1515
var constants = require('./constants');
@@ -20,7 +20,6 @@ var handleLineDefaults = require('./line_defaults');
2020
var handleLineShapeDefaults = require('./line_shape_defaults');
2121
var handleTextDefaults = require('./text_defaults');
2222
var handleFillColorDefaults = require('./fillcolor_defaults');
23-
var errorBarsSupplyDefaults = require('../../components/errorbars/defaults');
2423

2524
module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
2625
function coerce(attr, dflt) {
@@ -73,6 +72,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
7372
}
7473
coerce('hoveron', dfltHoverOn.join('+') || 'points');
7574

75+
var errorBarsSupplyDefaults = Registry.getComponentMethod('errorbars', 'supplyDefaults');
7676
errorBarsSupplyDefaults(traceIn, traceOut, defaultColor, {axis: 'y'});
7777
errorBarsSupplyDefaults(traceIn, traceOut, defaultColor, {axis: 'x', inherit: 'y'});
7878

‎src/traces/scatter/hover.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
var Lib = require('../../lib');
1212
var Fx = require('../../components/fx');
13-
var ErrorBars = require('../../components/errorbars');
13+
var Registry = require('../../registry');
1414
var getTraceColor = require('./get_trace_color');
1515
var Color = require('../../components/color');
1616
var fillHoverText = require('./fill_hover_text');
@@ -83,7 +83,7 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode) {
8383
});
8484

8585
fillHoverText(di, trace, pointData);
86-
ErrorBars.hoverInfo(di, trace, pointData);
86+
Registry.getComponentMethod('errorbars', 'hoverInfo')(di, trace, pointData);
8787

8888
return [pointData];
8989
}

‎src/traces/scatter/plot.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111

1212
var d3 = require('d3');
1313

14+
var Registry = require('../../registry');
1415
var Lib = require('../../lib');
1516
var Drawing = require('../../components/drawing');
16-
var ErrorBars = require('../../components/errorbars');
1717

1818
var subTypes = require('./subtypes');
1919
var linePoints = require('./line_points');
@@ -164,9 +164,8 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
164164
line = trace.line,
165165
tr = d3.select(element);
166166

167-
// (so error bars can find them along with bars)
168167
// error bars are at the bottom
169-
tr.call(ErrorBars.plot, plotinfo, transitionOpts);
168+
Registry.getComponentMethod('errorbars', 'plot')(tr, plotinfo, transitionOpts);
170169

171170
if(trace.visible !== true) return;
172171

‎src/traces/scatter/style.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
var d3 = require('d3');
1313
var Drawing = require('../../components/drawing');
14-
var ErrorBars = require('../../components/errorbars');
14+
var Registry = require('../../registry');
1515

1616
function style(gd, cd) {
1717
var s = cd ? cd[0].node3 : d3.select(gd).selectAll('g.trace.scatter');
@@ -32,7 +32,7 @@ function style(gd, cd) {
3232
s.selectAll('g.trace path.js-fill')
3333
.call(Drawing.fillGroupStyle);
3434

35-
s.call(ErrorBars.style);
35+
Registry.getComponentMethod('errorbars', 'style')(s);
3636
}
3737

3838
function stylePoints(sel, trace, gd) {

‎src/traces/scatter3d/calc_errors.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
var makeComputeError = require('../../components/errorbars/compute_error');
1313

14-
1514
function calculateAxisErrors(data, params, scaleFactor) {
1615
if(!params || !params.visible) return null;
1716

‎src/traces/scatter3d/defaults.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@ var subTypes = require('../scatter/subtypes');
1616
var handleMarkerDefaults = require('../scatter/marker_defaults');
1717
var handleLineDefaults = require('../scatter/line_defaults');
1818
var handleTextDefaults = require('../scatter/text_defaults');
19-
var errorBarsSupplyDefaults = require('../../components/errorbars/defaults');
2019

2120
var attributes = require('./attributes');
2221

23-
2422
module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
2523

2624
function coerce(attr, dflt) {
@@ -63,6 +61,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
6361
}
6462
}
6563

64+
var errorBarsSupplyDefaults = Registry.getComponentMethod('errorbars', 'supplyDefaults');
6665
errorBarsSupplyDefaults(traceIn, traceOut, defaultColor, {axis: 'z'});
6766
errorBarsSupplyDefaults(traceIn, traceOut, defaultColor, {axis: 'y', inherit: 'z'});
6867
errorBarsSupplyDefaults(traceIn, traceOut, defaultColor, {axis: 'x', inherit: 'z'});

‎src/traces/scattergl/defaults.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,18 @@
66
* LICENSE file in the root directory of this source tree.
77
*/
88

9-
109
'use strict';
1110

1211
var Lib = require('../../lib');
12+
var Registry = require('../../registry');
1313

14+
var attributes = require('./attributes');
1415
var constants = require('../scatter/constants');
1516
var subTypes = require('../scatter/subtypes');
1617
var handleXYDefaults = require('../scatter/xy_defaults');
1718
var handleMarkerDefaults = require('../scatter/marker_defaults');
1819
var handleLineDefaults = require('../scatter/line_defaults');
1920
var handleFillColorDefaults = require('../scatter/fillcolor_defaults');
20-
var errorBarsSupplyDefaults = require('../../components/errorbars/defaults');
21-
22-
var attributes = require('./attributes');
23-
2421

2522
module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
2623
function coerce(attr, dflt) {
@@ -63,6 +60,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
6360

6461
coerce('hoveron', dfltHoverOn.join('+') || 'points');
6562

63+
var errorBarsSupplyDefaults = Registry.getComponentMethod('errorbars', 'supplyDefaults');
6664
errorBarsSupplyDefaults(traceIn, traceOut, defaultColor, {axis: 'y'});
6765
errorBarsSupplyDefaults(traceIn, traceOut, defaultColor, {axis: 'x', inherit: 'y'});
6866

‎src/traces/scattergl/index.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ var rgba = require('color-normalize');
1717
var svgSdf = require('svg-path-sdf');
1818
var arrayRange = require('array-range');
1919

20+
var Registry = require('../../registry');
2021
var Lib = require('../../lib');
2122
var Axes = require('../../plots/cartesian/axes');
2223
var Drawing = require('../../components/drawing');
23-
var ErrorBars = require('../../components/errorbars');
2424
var formatColor = require('../../lib/gl_format_color');
2525

2626
var subTypes = require('../scatter/subtypes');
@@ -194,7 +194,9 @@ function sceneOptions(gd, subplot, trace, positions) {
194194
var linePositions;
195195

196196
// get error values
197-
var errorVals = hasError ? ErrorBars.calcFromTrace(trace, fullLayout) : null;
197+
var errorVals = hasError ?
198+
Registry.getComponentMethod('errorbars', 'calcFromTrace')(trace, fullLayout) :
199+
null;
198200

199201
if(hasErrorX) {
200202
errorXOptions = {};
@@ -1129,7 +1131,7 @@ function hoverPoints(pointData, xval, yval, hovermode) {
11291131
else if(trace.text) pointData.text = trace.text;
11301132

11311133
fillHoverText(di, trace, pointData);
1132-
ErrorBars.hoverInfo(di, trace, pointData);
1134+
Registry.getComponentMethod('errorbars', 'hoverInfo')(di, trace, pointData);
11331135

11341136
return [pointData];
11351137
}

0 commit comments

Comments
 (0)