Skip to content

Commit 707c017

Browse files
committed
revised code with new mock
1 parent 912e554 commit 707c017

File tree

3 files changed

+36
-11
lines changed

3 files changed

+36
-11
lines changed

src/components/colorbar/connect.js

+4-6
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,10 @@ module.exports = function connectColorbar(gd, cd, moduleOpts) {
4141

4242
var trace = cd[0].trace;
4343
var cbId = 'cb' + trace.uid;
44-
var containerNames = (moduleOpts.container) ?
45-
moduleOpts.container.split(' | ') :
46-
[moduleOpts.container];
44+
moduleOpts = Array.isArray(moduleOpts) ? moduleOpts : [moduleOpts];
4745

48-
for(var i = 0; i < containerNames.length; i++) {
49-
var containerName = containerNames[i];
46+
for(var i = 0; i < moduleOpts.length; i++) {
47+
var containerName = moduleOpts[i].container;
5048

5149
var container = containerName ? trace[containerName] : trace;
5250

@@ -60,7 +58,7 @@ module.exports = function connectColorbar(gd, cd, moduleOpts) {
6058
container.colorscale;
6159

6260
cb.fillgradient(scl)
63-
.zrange([container[moduleOpts.min], container[moduleOpts.max]])
61+
.zrange([container[moduleOpts[i].min], container[moduleOpts[i].max]])
6462
.options(container.colorbar)();
6563

6664
return;

src/traces/scatter3d/index.js

+11-5
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,17 @@ Scatter3D.plot = require('./convert');
1414
Scatter3D.attributes = require('./attributes');
1515
Scatter3D.markerSymbols = require('../../constants/gl3d_markers');
1616
Scatter3D.supplyDefaults = require('./defaults');
17-
Scatter3D.colorbar = {
18-
container: 'marker | line',
19-
min: 'cmin',
20-
max: 'cmax'
21-
};
17+
Scatter3D.colorbar = [
18+
{
19+
container: 'marker',
20+
min: 'cmin',
21+
max: 'cmax'
22+
}, {
23+
container: 'line',
24+
min: 'cmin',
25+
max: 'cmax'
26+
}
27+
];
2228
Scatter3D.calc = require('./calc');
2329

2430
Scatter3D.moduleType = 'trace';
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"data": [
3+
{
4+
"x": [1, 2, 4, 8, 16],
5+
"y": [-1, -2, -4, -8, -16],
6+
"z": [0, 1, 0, 1, 0],
7+
"type": "scatter3d",
8+
"mode": "lines",
9+
"line": {
10+
"color": [0, 0.25, 0.5, 0.75, 1.0],
11+
"showscale": true,
12+
"width": 10
13+
}
14+
}
15+
],
16+
"layout": {
17+
"title": "Scatter3d show scale with line colors",
18+
"width": 600,
19+
"height": 600
20+
}
21+
}

0 commit comments

Comments
 (0)