diff --git a/cypress/platform/current.html b/cypress/platform/current.html index ba896f143..cdbdc9db8 100644 --- a/cypress/platform/current.html +++ b/cypress/platform/current.html @@ -46,7 +46,7 @@ flowchart TB
- flowchart RL + flowchart BT subgraph a b1 -- ok --> b2 end diff --git a/src/dagre-wrapper/edges.js b/src/dagre-wrapper/edges.js index bc93dab68..983c47851 100644 --- a/src/dagre-wrapper/edges.js +++ b/src/dagre-wrapper/edges.js @@ -120,15 +120,13 @@ export const intersection = (node, outsidePoint, insidePoint) => { // let q = insidePoint.y < outsidePoint.y ? outsidePoint.y - h - y : y - h - outsidePoint.y; let q = insidePoint.y < outsidePoint.y ? outsidePoint.y - h - y : y - h - outsidePoint.y; r = (R * q) / Q; - logger.warn(`topp/bott calc, Q ${Q}, q ${q}, R ${R}, r ${r}`, { - x: insidePoint.x < outsidePoint.x ? insidePoint.x + R - r : insidePoint.x + dx - w, - y: outsidePoint.y + q - }); - - return { - x: insidePoint.x < outsidePoint.x ? insidePoint.x + R - r : insidePoint.x + dx - w, + const res = { + x: insidePoint.x < outsidePoint.x ? insidePoint.x + R - r : insidePoint.x - r, y: outsidePoint.y + q }; + logger.warn(`topp/bott calc, Q ${Q}, q ${q}, R ${R}, r ${r}`, res); + + return res; } else { // Intersection onn sides of rect // q = (Q * r) / R; diff --git a/src/dagre-wrapper/edges.spec.js b/src/dagre-wrapper/edges.spec.js index 05b02d981..9af180eda 100644 --- a/src/dagre-wrapper/edges.spec.js +++ b/src/dagre-wrapper/edges.spec.js @@ -55,7 +55,7 @@ describe('Graphlib decorations', () => { height: 176.5 } const int = intersection(node2, o, i); - expect(int.x).toBeCloseTo(127.39979619565217) + expect(int.x).toBeCloseTo(167.9232336956522) expect(int.y).toBeCloseTo(76) });