Skip to content

Display a colorscale when scatter3d.line.showscale is set #3384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jan 14, 2019
Merged

Display a colorscale when scatter3d.line.showscale is set #3384

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d245c2d
fix issue 2862 by showing colorbar when scatter line has scale e.g. s…
archmoj Jan 2, 2019
f9dce0d
handling the case of undefined container
archmoj Jan 2, 2019
991face
return after setting colorscale
archmoj Jan 2, 2019
912e554
apply line colorscale case for scatter3d only
archmoj Jan 2, 2019
707c017
revised code with new mock
archmoj Jan 3, 2019
60b87a2
new mock and baseline to lock issue 2862
archmoj Jan 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 20 additions & 11 deletions src/components/colorbar/connect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,28 @@ module.exports = function connectColorbar(gd, cd, moduleOpts) {

var trace = cd[0].trace;
var cbId = 'cb' + trace.uid;
var containerName = moduleOpts.container;
var container = containerName ? trace[containerName] : trace;
var containerNames = (moduleOpts.container) ?
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.... and let's make this Array.isArray(moduleOpts.container) ? ....

moduleOpts.container.split(' | ') :
[moduleOpts.container];

gd._fullLayout._infolayer.selectAll('.' + cbId).remove();
if(!container || !container.showscale) return;
for(var i = 0; i < containerNames.length; i++) {
var containerName = containerNames[i];

var cb = cd[0].t.cb = drawColorbar(gd, cbId);
var container = containerName ? trace[containerName] : trace;

var scl = container.reversescale ?
flipScale(container.colorscale) :
container.colorscale;
gd._fullLayout._infolayer.selectAll('.' + cbId).remove();
if(!container || !container.showscale) continue;

cb.fillgradient(scl)
.zrange([container[moduleOpts.min], container[moduleOpts.max]])
.options(container.colorbar)();
var cb = cd[0].t.cb = drawColorbar(gd, cbId);

var scl = container.reversescale ?
flipScale(container.colorscale) :
container.colorscale;

cb.fillgradient(scl)
.zrange([container[moduleOpts.min], container[moduleOpts.max]])
.options(container.colorbar)();

return;
}
};
2 changes: 1 addition & 1 deletion src/traces/scatter/line_defaults.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ module.exports = function lineDefaults(traceIn, traceOut, defaultColor, layout,
coerce('line.color', defaultColor);

if(hasColorscale(traceIn, 'line')) {
colorscaleDefaults(traceIn, traceOut, layout, coerce, {prefix: 'line.', cLetter: 'c', noScale: true});
colorscaleDefaults(traceIn, traceOut, layout, coerce, {prefix: 'line.', cLetter: 'c'});
} else {
var lineColorDflt = (isArrayOrTypedArray(markerColor) ? false : markerColor) || defaultColor;
coerce('line.color', lineColorDflt);
Expand Down
3 changes: 0 additions & 3 deletions src/traces/scatter3d/attributes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ var lineAttrs = extendFlat({
description: 'Sets the dash style of the lines.'
}
}, colorAttributes('line'));
// not yet implemented
delete lineAttrs.showscale;
delete lineAttrs.colorbar;

function makeProjectionAttr(axLetter) {
return {
Expand Down
6 changes: 5 additions & 1 deletion src/traces/scatter3d/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@ Scatter3D.plot = require('./convert');
Scatter3D.attributes = require('./attributes');
Scatter3D.markerSymbols = require('../../constants/gl3d_markers');
Scatter3D.supplyDefaults = require('./defaults');
Scatter3D.colorbar = require('../scatter/marker_colorbar');
Scatter3D.colorbar = {
container: 'marker | line',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm. That | business is a little too hacky for my taste.

Could you make this:

 Scatter3D.colorbar = [{
  container: 'marker',
  min: 'cmin',
  max: 'cmax'
}, {
  container: 'line',
  min: 'cmin',
  max: 'cmax'
}]

? Thank you!

min: 'cmin',
max: 'cmax'
};
Scatter3D.calc = require('./calc');

Scatter3D.moduleType = 'trace';
Expand Down