Skip to content
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

Jump to bottom

Sankey link/node pixel level alignment #2021

Merged
merged 6 commits into from
Sep 20, 2017
Merged

Sankey link/node pixel level alignment #2021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8ad871d
rework pixel-scale adjustments
monfera Sep 19, 2017
03472fb
adjusting minimal node size
monfera Sep 19, 2017
5c2c609
baseline update
monfera Sep 19, 2017
6cc5dfb
geometricPrecision
monfera Sep 20, 2017
7605ae5
adding new mock (geometricPrecision)
monfera Sep 20, 2017
4d52bbb
jasmine test updates for pixel-level changes
monfera Sep 20, 2017
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
19 changes: 4 additions & 15 deletions src/traces/sankey/render.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,8 @@ function nodeModel(uniqueKeys, d, n) {
var tc = tinycolor(n.color),
zoneThicknessPad = c.nodePadAcross,
zoneLengthPad = d.nodePad / 2,
visibleThickness = n.dx + 0.5,
visibleLength = Math.max(1, n.dy - 0.5);
visibleThickness = n.dx,
visibleLength = Math.max(0.5, n.dy);

var basicKey = n.label;
var foundKey = uniqueKeys[basicKey];
Expand All @@ -203,7 +203,7 @@ function nodeModel(uniqueKeys, d, n) {
textFont: d.textFont,
size: d.horizontal ? d.height : d.width,
visibleWidth: Math.ceil(visibleThickness),
visibleHeight: Math.ceil(visibleLength),
visibleHeight: visibleLength,
zoneX: -zoneThicknessPad,
zoneY: -zoneLengthPad,
zoneWidth: visibleThickness + 2 * zoneThicknessPad,
Expand All @@ -227,14 +227,10 @@ function nodeModel(uniqueKeys, d, n) {

// rendering snippets

function crispLinesOnEnd(sankeyNode) {
d3.select(sankeyNode.node().parentNode).style('shape-rendering', 'crispEdges');
}

function updateNodePositions(sankeyNode) {
sankeyNode
.attr('transform', function(d) {
return 'translate(' + (d.node.x - 0.5) + ', ' + (d.node.y - d.node.dy / 2 + 0.5) + ')';
return 'translate(' + d.node.x.toFixed(3) + ', ' + (d.node.y - d.node.dy / 2).toFixed(3) + ')';
});
}

Expand All @@ -247,7 +243,6 @@ function linkPath(d) {
}

function updateNodeShapes(sankeyNode) {
d3.select(sankeyNode.node().parentNode).style('shape-rendering', 'optimizeSpeed');
sankeyNode.call(updateNodePositions);
}

Expand Down Expand Up @@ -360,7 +355,6 @@ function attachDragHandler(sankeyNode, sankeyLink, callbacks) {
if(d.arrangement !== 'snap') {
d.sankey.relayout();
updateShapes(sankeyNode.filter(sameLayer(d)), sankeyLink);
sankeyNode.call(crispLinesOnEnd);
}
})

Expand Down Expand Up @@ -414,15 +408,11 @@ function snappingForce(sankeyNode, forceKey, nodes, d) {
}
if(!d.interactionState.dragInProgress && maxVelocity < 0.1 && d.forceLayouts[forceKey].alpha() > 0) {
d.forceLayouts[forceKey].alpha(0);
window.setTimeout(function() {
sankeyNode.call(crispLinesOnEnd);
}, 30); // geome on move, crisp when static
}
};
}

// scene graph

module.exports = function(svg, styledData, layout, callbacks) {
var sankey = svg.selectAll('.sankey')
.data(styledData
Expand Down Expand Up @@ -495,7 +485,6 @@ module.exports = function(svg, styledData, layout, callbacks) {

sankeyNodeSet.enter()
.append('g')
.style('shape-rendering', 'geometricPrecision')
.classed('sankeyNodeSet', true);

sankeyNodeSet
Expand Down
Binary file modified test/image/baselines/sankey_energy.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/image/baselines/sankey_energy_dark.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions test/jasmine/tests/sankey_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ describe('sankey tests', function() {
.then(function() {
expect(d3.selectAll('.sankey .nodeRect')[0].reduce(function(prevMin, rect) {
return Math.min(prevMin, d3.select(rect).attr('height'));
}, Infinity)).toEqual(1);
}, Infinity)).toEqual(0.5);
done();
});
});
Expand All @@ -375,7 +375,7 @@ describe('sankey tests', function() {
describe('Test hover/click interactions:', function() {
afterEach(destroyGraphDiv);

it('should shows the correct hover labels', function(done) {
it('should show the correct hover labels', function(done) {
var gd = createGraphDiv();
var mockCopy = Lib.extendDeep({}, mock);

Expand All @@ -386,7 +386,7 @@ describe('sankey tests', function() {
}

Plotly.plot(gd, mockCopy).then(function() {
_hover(400, 300);
_hover(404, 302);

assertLabel(
['Solid', 'Incoming flow count: 4', 'Outgoing flow count: 3', '447TWh'],
Expand All @@ -404,7 +404,7 @@ describe('sankey tests', function() {
return Plotly.relayout(gd, 'hoverlabel.font.family', 'Roboto');
})
.then(function() {
_hover(400, 300);
_hover(404, 302);

assertLabel(
['Solid', 'Incoming flow count: 4', 'Outgoing flow count: 3', '447TWh'],
Expand All @@ -427,7 +427,7 @@ describe('sankey tests', function() {
});
})
.then(function() {
_hover(400, 300);
_hover(404, 302);

assertLabel(
['Solid', 'Incoming flow count: 4', 'Outgoing flow count: 3', '447TWh'],
Expand Down Expand Up @@ -482,7 +482,7 @@ describe('sankey tests', function() {

function _makeWrapper(eventType, mouseFn) {
var posByElementType = {
node: [400, 300],
node: [404, 302],
link: [450, 300]
};

Expand Down