marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-27 03:09:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into bug/1710_underscore_in_entity_names

Browse Source
This commit is contained in:
Adrian Hall
2020-10-23 10:02:50 +01:00
parent 245e25f4b7 74d09b5468
commit 851cff4bb8
3 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/dagre-wrapper/edges.js
View File

@@ -235,7 +235,7 @@ export const intersection = (node, outsidePoint, insidePoint) => {
r = (R * q) / Q;
const res = {
x: insidePoint.x < outsidePoint.x ? insidePoint.x + R - r : insidePoint.x - r,
y: outsidePoint.y + q
y: insidePoint.y < outsidePoint.y ? insidePoint.y + Q - q : insidePoint.y - q
};
logger.warn(`topp/bott calc, Q ${Q}, q ${q}, R ${R}, r ${r}`, res);

6
src/dagre-wrapper/edges.spec.js
View File

@@ -42,7 +42,8 @@ describe('Graphlib decorations', () => {
}
const int = intersection(node2, o, i);
expect(int.x).toBeCloseTo(127.39979619565217)
expect(int.y).toBeCloseTo(76)
// expect(int.y).toBeCloseTo(76)
expect(int.y).toBeCloseTo(67.833)
});
it('case 4 - intersection on top of box inside point greater then inside point', function () {
@@ -56,7 +57,8 @@ describe('Graphlib decorations', () => {
}
const int = intersection(node2, o, i);
expect(int.x).toBeCloseTo(167.9232336956522)
expect(int.y).toBeCloseTo(76)
// expect(int.y).toBeCloseTo(76)
expect(int.y).toBeCloseTo(67.833)
});
});