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

fix: correctly draw links when strokeWidth is zero #186

Merged
merged 2 commits into from
Feb 7, 2021
Merged

fix: correctly draw links when strokeWidth is zero #186

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0015b3f
fix: correctly draw links when strokeWidth is zero
sehilyi Feb 5, 2021
c80a8a2
fix: correct line start and end positions when ill-defined
sehilyi Feb 7, 2021
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
40 changes: 30 additions & 10 deletions src/core/mark/link.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,29 @@ export function drawLink(g: PIXI.Graphics, model: GoslingTrackModel) {
const color = model.encodedPIXIProperty('color', d);
const opacity = model.encodedPIXIProperty('opacity', d);

// Is this band or line?
const isBand =
xe !== undefined &&
x1e !== undefined &&
// This means the strokeWidth of a band is 1, so we just need to draw a line instead
x !== xe &&
x1 !== x1e;

// Should we do this when building Gosling Model?
if (!isBand && xe === undefined) {
// We need to use a valid number to draw lines, so lets find alternative one.
if (x1 === undefined && x1e === undefined) {
// We do not have a valid ones.
return;
}
xe = x1 !== undefined ? x1 : x1e;
}

if (!isBand && x === xe && x1 == x1e) {
// Put the larger value on `xe` so that it can be used in line connection
xe = x1;
}

// stroke
g.lineStyle(
model.encodedValue('strokeWidth'),
Expand All @@ -63,9 +86,7 @@ export function drawLink(g: PIXI.Graphics, model: GoslingTrackModel) {
const flipY = IsChannelDeep(spec.y) && spec.y.flip;
const baseY = rowPosition + (flipY ? 0 : rowHeight);

if (x1 !== undefined && x1e !== undefined) {
// This means we need to draw 'band' connections
// TODO: Better way to simply this line (i.e., 'none' for 0 opacity)?
if (isBand) {
g.beginFill(color === 'none' ? colorToHex('white') : colorToHex(color), color === 'none' ? 0 : opacity);

// Sort values to safely draw bands
Expand Down Expand Up @@ -152,14 +173,18 @@ export function drawLink(g: PIXI.Graphics, model: GoslingTrackModel) {
}
}
} else {
// This means we need to draw 'line' connections
/* Line Connection */

if (xe - x <= 0.1) {
// Do not draw very small links
return;
}

const midX = (x + xe) / 2.0;

// Must not fill color for `line`, just use `stroke`
g.beginFill(colorToHex('white'), 0);

if (circular) {
if (x < 0 || xe > trackWidth) {
// Do not show bands that are partly outside of the current domain
Expand All @@ -172,26 +197,21 @@ export function drawLink(g: PIXI.Graphics, model: GoslingTrackModel) {

g.moveTo(posS.x, posS.y);
g.bezierCurveTo(posS.x, posS.y, trackWidth / 2.0, trackHeight / 2.0, posE.x, posE.y);

// straight line
// g.moveTo(posS.x, posS.y);
// g.lineTo(posE.x, posE.y);
} else {
g.moveTo(x, baseY);

if (spec.style?.circularLink) {
if (xe < 0 || x > trackWidth) {
// Q: Do we really need this?
return;
}
g.arc(midX, baseY, (xe - x) / 2.0, -Math.PI, Math.PI);
g.closePath();
} else {
g.bezierCurveTo(
x + (xe - x) / 3.0,
// rowPosition,
baseY + Math.min(rowHeight, (xe - x) / 2.0) * (flipY ? 1 : -1),
x + ((xe - x) / 3.0) * 2,
// rowPosition,
baseY + Math.min(rowHeight, (xe - x) / 2.0) * (flipY ? 1 : -1),
xe,
baseY
Expand Down