marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-08-21 17:26:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

#5237 Fix for issues generated by linkting/cleanup

Browse Source
This commit is contained in:
Knut Sveidqvist
2024-07-19 12:19:27 +02:00
parent 7175f5776f
commit 2718cdae51
1 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
packages/mermaid-layout-elk/src/render.ts
View File

@@ -684,32 +684,32 @@ export const render = async (data4Layout: LayoutData, svg, element, algorithm) =
edge.y = edge.labels[0].y + offset.y + edge.labels[0].height / 2; edge.y = edge.labels[0].y + offset.y + edge.labels[0].height / 2;
positionEdgeLabel(edge, paths); positionEdgeLabel(edge, paths);
} }
const src = edge.sections[0].startPoint; // const src = edge.sections[0].startPoint;
const dest = edge.sections[0].endPoint; // const dest = edge.sections[0].endPoint;
const segments = edge.sections[0].bendPoints ? edge.sections[0].bendPoints : []; // const segments = edge.sections[0].bendPoints ? edge.sections[0].bendPoints : [];
const segPoints = segments.map((segment) => { // const segPoints = segments.map((segment) => {
return { x: segment.x + offset.x, y: segment.y + offset.y }; // return { x: segment.x + offset.x, y: segment.y + offset.y };
}); // });
edge.points = [ // edge.points = [
{ x: src.x + offset.x, y: src.y + offset.y }, // { x: src.x + offset.x, y: src.y + offset.y },
...segPoints, // ...segPoints,
{ x: dest.x + offset.x, y: dest.y + offset.y }, // { x: dest.x + offset.x, y: dest.y + offset.y },
]; // ];
const paths = insertEdge( // const paths = insertEdge(
edgesEl, // edgesEl,
edge, // edge,
clusterDb, // clusterDb,
data4Layout.type, // data4Layout.type,
startNode, // startNode,
endNode, // endNode,
data4Layout.diagramId // data4Layout.diagramId
); // );
log.info('APA12 edge points after insert', JSON.stringify(edge.points)); // log.info('APA12 edge points after insert', JSON.stringify(edge.points));
edge.x = edge.labels[0].x + offset.x + edge.labels[0].width / 2; // edge.x = edge.labels[0].x + offset.x + edge.labels[0].width / 2;
edge.y = edge.labels[0].y + offset.y + edge.labels[0].height / 2; // edge.y = edge.labels[0].y + offset.y + edge.labels[0].height / 2;
positionEdgeLabel(edge, paths); // positionEdgeLabel(edge, paths);
}); });
}; };
@@ -766,7 +766,7 @@ function intersectLine(p1, p2, q1, q2) {
// The denom/2 is to get rounding instead of truncating. It // The denom/2 is to get rounding instead of truncating. It
// is added or subtracted to the numerator, depending upon the // is added or subtracted to the numerator, depending upon the
// sign of the numerator. // sign of the numerator.
num = b1 * c2 - b2 * c1; let num = b1 * c2 - b2 * c1;
const x = num < 0 ? (num - offset) / denom : (num + offset) / denom; const x = num < 0 ? (num - offset) / denom : (num + offset) / denom;
num = a2 * c1 - a1 * c2; num = a2 * c1 - a1 * c2;
@@ -925,7 +925,7 @@ export const intersection = (node, outsidePoint, insidePoint) => {
} }
}; };
const outsideNode = (node, point) => { const outsideNode = (node, point) => {
log.debug('Checking bounds ', node, point); console.log('Checking bounds ', node, point);
const x = node.x; const x = node.x;
const y = node.y; const y = node.y;
const dx = Math.abs(point.x - x); const dx = Math.abs(point.x - x);