Skip to content

Commit f969e8c

Browse files
etpinardetpinard
committed
require colorscale methods directly
1 parent 2a600d1 commit f969e8c

File tree

18 files changed

+70
-59
lines changed

18 files changed

+70
-59
lines changed

‎src/lib/coerce.js‎

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

1010
'use strict';
1111

12-
var Plotly = require('../plotly');
1312
var isNumeric = require('fast-isnumeric');
1413
var tinycolor = require('tinycolor2');
1514
var nestedProperty = require('./nested_property');
1615

16+
var getColorscale = require('../components/colorscale/get_scale');
1717
var colorscaleNames = Object.keys(require('../components/colorscale/scales'));
1818

1919

@@ -140,7 +140,7 @@ exports.valObjects = {
140140
requiredOpts: [],
141141
otherOpts: ['dflt'],
142142
coerceFunction: function(v, propOut, dflt) {
143-
propOut.set(Plotly.Colorscale.getScale(v, dflt));
143+
propOut.set(getColorscale(v, dflt));
144144
}
145145
},
146146
angle: {

‎src/traces/bar/calc.js‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
var isNumeric = require('fast-isnumeric');
1313

1414
var Plotly = require('../../plotly');
15+
var hasColorscale = require('../../components/colorscale/has_colorscale');
16+
var colorscaleCalc = require('../../components/colorscale/calc');
1517

1618

1719
module.exports = function calc(gd, trace) {
@@ -44,11 +46,11 @@ module.exports = function calc(gd, trace) {
4446
}
4547

4648
// auto-z and autocolorscale if applicable
47-
if(Plotly.Colorscale.hasColorscale(trace, 'marker')) {
48-
Plotly.Colorscale.calc(trace, trace.marker.color, 'marker', 'c');
49+
if(hasColorscale(trace, 'marker')) {
50+
colorscaleCalc(trace, trace.marker.color, 'marker', 'c');
4951
}
50-
if(Plotly.Colorscale.hasColorscale(trace, 'marker.line')) {
51-
Plotly.Colorscale.calc(trace, trace.marker.line.color, 'marker.line', 'c');
52+
if(hasColorscale(trace, 'marker.line')) {
53+
colorscaleCalc(trace, trace.marker.line.color, 'marker.line', 'c');
5254
}
5355

5456
return cd;

‎src/traces/bar/style_defaults.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,23 @@
1010
'use strict';
1111

1212
var Color = require('../../components/color');
13-
var Colorscale = require('../../components/colorscale');
13+
var hasColorscale = require('../../components/colorscale/has_colorscale');
14+
var colorscaleDefaults = require('../../components/colorscale/defaults');
1415

1516

1617
module.exports = function handleStyleDefaults(traceIn, traceOut, coerce, defaultColor, layout) {
1718
coerce('marker.color', defaultColor);
1819

19-
if(Colorscale.hasColorscale(traceIn, 'marker')) {
20-
Colorscale.handleDefaults(
20+
if(hasColorscale(traceIn, 'marker')) {
21+
colorscaleDefaults(
2122
traceIn, traceOut, layout, coerce, {prefix: 'marker.', cLetter: 'c'}
2223
);
2324
}
2425

2526
coerce('marker.line.color', Color.defaultLine);
2627

27-
if(Colorscale.hasColorscale(traceIn, 'marker.line')) {
28-
Colorscale.handleDefaults(
28+
if(hasColorscale(traceIn, 'marker.line')) {
29+
colorscaleDefaults(
2930
traceIn, traceOut, layout, coerce, {prefix: 'marker.line.', cLetter: 'c'}
3031
);
3132
}

‎src/traces/choropleth/defaults.js‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,28 @@
99

1010
'use strict';
1111

12-
var Plotly = require('../../plotly');
13-
var Choropleth = require('./');
12+
var Lib = require('../../lib');
13+
14+
var colorscaleDefaults = require('../../components/colorscale/defaults');
15+
var attributes = require('./attributes');
1416

15-
module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
16-
var locations, len, z;
1717

18+
module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
1819
function coerce(attr, dflt) {
19-
return Plotly.Lib.coerce(traceIn, traceOut, Choropleth.attributes, attr, dflt);
20+
return Lib.coerce(traceIn, traceOut, attributes, attr, dflt);
2021
}
2122

22-
locations = coerce('locations');
23+
var locations = coerce('locations');
24+
25+
var len;
2326
if(locations) len = locations.length;
27+
2428
if(!locations || !len) {
2529
traceOut.visible = false;
2630
return;
2731
}
2832

29-
z = coerce('z');
33+
var z = coerce('z');
3034
if(!Array.isArray(z)) {
3135
traceOut.visible = false;
3236
return;
@@ -41,7 +45,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
4145
coerce('marker.line.color');
4246
coerce('marker.line.width');
4347

44-
Plotly.Colorscale.handleDefaults(
48+
colorscaleDefaults(
4549
traceIn, traceOut, layout, coerce, {prefix: '', cLetter: 'z'}
4650
);
4751

‎src/traces/choropleth/index.js‎

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

1212
var Plotly = require('../../plotly');
1313

14-
var Choropleth = module.exports = {};
15-
16-
Plotly.Plots.register(Choropleth, 'choropleth', ['geo', 'noOpacity'], {
14+
Plotly.Plots.register(exports, 'choropleth', ['geo', 'noOpacity'], {
1715
description: [
1816
'The data that describes the choropleth value-to-color mapping',
1917
'is set in `z`.',
@@ -22,14 +20,10 @@ Plotly.Plots.register(Choropleth, 'choropleth', ['geo', 'noOpacity'], {
2220
].join(' ')
2321
});
2422

25-
Choropleth.attributes = require('./attributes');
26-
27-
Choropleth.supplyDefaults = require('./defaults');
28-
29-
Choropleth.colorbar = require('../heatmap/colorbar');
23+
exports.attributes = require('./attributes');
3024

31-
Choropleth.calc = function(gd, trace) {
25+
exports.supplyDefaults = require('./defaults');
3226

33-
Plotly.Colorscale.calc(trace, trace.z, '', 'z');
27+
exports.colorbar = require('../heatmap/colorbar');
3428

35-
};
29+
exports.calc = require('../surface/calc');

‎src/traces/choropleth/plot.js‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,12 @@
1212
var Plotly = require('../../plotly');
1313
var d3 = require('d3');
1414

15+
var Color = require('../../components/color');
1516
var getTopojsonFeatures = require('../../lib/topojson_utils').getTopojsonFeatures;
1617
var locationToFeature = require('../../lib/geo_location_utils').locationToFeature;
1718
var arrayToCalcItem = require('../../lib/array_to_calc_item');
19+
var getColorscale = require('../../components/colorscale/get_scale');
20+
var makeScaleFunction = require('../../components/colorscale/make_scale_function');
1821

1922
var constants = require('../../constants/geo_constants');
2023

@@ -130,14 +133,14 @@ plotChoropleth.style = function(geo) {
130133
markerLine = marker.line || {},
131134
zmin = trace.zmin,
132135
zmax = trace.zmax,
133-
scl = Plotly.Colorscale.getScale(trace.colorscale),
134-
sclFunc = Plotly.Colorscale.makeScaleFunction(scl, zmin, zmax);
136+
scl = getColorscale(trace.colorscale),
137+
sclFunc = makeScaleFunction(scl, zmin, zmax);
135138

136139
s.selectAll('path.choroplethlocation')
137140
.each(function(d) {
138141
d3.select(this)
139142
.attr('fill', function(d) { return sclFunc(d.z); })
140-
.call(Plotly.Color.stroke, d.mlc || markerLine.color)
143+
.call(Color.stroke, d.mlc || markerLine.color)
141144
.call(Plotly.Drawing.dashLine, '', d.mlw || markerLine.width);
142145
});
143146
});

‎src/traces/contour/colorbar.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
var d3 = require('d3');
1313

1414
var Plotly = require('../../plotly');
15+
var getColorscale = require('../../components/colorscale/get_scale');
1516

1617

1718
module.exports = function colorbar(gd, cd) {
@@ -33,7 +34,7 @@ module.exports = function colorbar(gd, cd) {
3334
line = trace.line,
3435
cs = contours.size||1,
3536
nc = Math.floor((contours.end + cs/10 - contours.start)/cs)+1,
36-
scl = Plotly.Colorscale.getScale(trace.colorscale),
37+
scl = getColorscale(trace.colorscale),
3738
extraLevel = contours.coloring==='lines' ? 0 : 1,
3839
colormap = d3.scale.linear().interpolate(d3.interpolateRgb),
3940
colorDomain = scl.map(function(si){

‎src/traces/contour/style.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
var d3 = require('d3');
1313

1414
var Plotly = require('../../plotly');
15+
var getColorscale = require('../../components/colorscale/get_scale');
1516
var heatmapStyle = require('../heatmap/style');
1617

1718

@@ -26,7 +27,7 @@ module.exports = function style(gd) {
2627
colorLines = contours.coloring==='lines',
2728
cs = contours.size||1,
2829
nc = Math.floor((contours.end + cs/10 - contours.start)/cs) + 1,
29-
scl = Plotly.Colorscale.getScale(trace.colorscale),
30+
scl = getColorscale(trace.colorscale),
3031
extraLevel = colorLines ? 0 : 1,
3132
colormap = d3.scale.linear()
3233
.domain(scl.map(function(si){

‎src/traces/contour/style_defaults.js‎

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

1010
'use strict';
1111

12-
var Colorscale = require('../../components/colorscale');
12+
var colorscaleDefaults = require('../../components/colorscale/defaults');
1313

1414

1515
module.exports = function handleStyleDefaults(traceIn, traceOut, coerce, layout) {
@@ -27,7 +27,7 @@ module.exports = function handleStyleDefaults(traceIn, traceOut, coerce, layout)
2727
coerce('line.smoothing');
2828

2929
if((traceOut.contours || {}).coloring !== 'none') {
30-
Colorscale.handleDefaults(
30+
colorscaleDefaults(
3131
traceIn, traceOut, layout, coerce, {prefix: '', cLetter: 'z'}
3232
);
3333
}

‎src/traces/heatmap/calc.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ var Plotly = require('../../plotly');
1515
var Lib = require('../../lib');
1616

1717
var histogram2dCalc = require('../histogram2d/calc');
18+
var colorscaleCalc = require('../../components/colorscale/calc');
1819
var hasColumns = require('./has_columns');
1920
var convertColumnXYZ = require('./convert_column_xyz');
2021
var maxRowLength = require('./max_row_length');
@@ -120,7 +121,7 @@ module.exports = function calc(gd, trace) {
120121
var cd0 = {x: xArray, y: yArray, z: z};
121122

122123
// auto-z and autocolorscale if applicable
123-
Plotly.Colorscale.calc(trace, z, '', 'z');
124+
colorscaleCalc(trace, z, '', 'z');
124125

125126
if(isContour && trace.contours && trace.contours.coloring==='heatmap') {
126127
var hmType = trace.type === 'contour' ? 'heatmap' : 'histogram2d';

0 commit comments

Comments
 (0)