Skip to content

Commit

Permalink
resolved conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
bengarvey committed Nov 11, 2024
2 parents 2c0864e + 9813157 commit 1993563
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion js/lineage.js
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ function Lineage() {
}

function getCanvasSimulation(simulationMode) {
console.log('getCanvasSim');
canvas
.on('mousemove', mousemoved)
.call(d3.drag()
Expand Down Expand Up @@ -485,9 +486,9 @@ function Lineage() {
context.translate(transform.x, transform.y);
context.scale(transform.k, transform.k);
context.translate(width / 2, height / 2);
console.timeLog('tree', 'after transform');

context.lineWidth = 1;

links.forEach(drawLink);

users.forEach((user) => {
Expand Down

0 comments on commit 1993563

Please sign in to comment.