marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-11-16 10:44:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

#1295 Start shape and handling of setting a unique start id per cluster level

Browse Source
This commit is contained in:
Knut Sveidqvist
2020-03-25 20:16:27 +01:00
parent c7aa67b07a
commit 159a3a3706
7 changed files with 129 additions and 372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,7 +82,7 @@ const outsideNode = (node, point) => {
// return { x: insidePoint.x + r, y: insidePoint.y + q };
// };
const intersection = (node, outsidePoint, insidePoint) => {
logger.info('intersection', outsidePoint, insidePoint, node);
// logger.info('intersection', outsidePoint, insidePoint, node);
const x = node.x;
const y = node.y;
@@ -93,8 +93,6 @@ const intersection = (node, outsidePoint, insidePoint) => {
const h = node.height / 2;
let q = h - dy;
logger.info('q och r', q, r);
const Q = Math.abs(outsidePoint.y - insidePoint.y);
const R = Math.abs(outsidePoint.x - insidePoint.x);
if (Math.abs(y - outsidePoint.y) * w > Math.abs(x - outsidePoint.x) * h || false) { // eslint-disable-line
@@ -120,8 +118,8 @@ export const insertEdge = function(elem, edge, clusterDb) {
logger.info('\n\n\n\n');
let points = edge.points;
if (edge.toCluster) {
logger.info('edge', edge);
logger.info('to cluster', clusterDb[edge.toCluster]);
// logger.info('edge', edge);
// logger.info('to cluster', clusterDb[edge.toCluster]);
points = [];
let lastPointOutside;
let isInside = false;
@@ -129,11 +127,11 @@ export const insertEdge = function(elem, edge, clusterDb) {
const node = clusterDb[edge.toCluster].node;
if (!outsideNode(node, point) && !isInside) {
logger.info('inside', edge.toCluster, point);
// logger.info('inside', edge.toCluster, point);
// First point inside the rect
const insterection = intersection(node, lastPointOutside, point);
logger.info('intersect', inter.rect(node, lastPointOutside));
// logger.info('intersect', inter.rect(node, lastPointOutside));
points.push(insterection);
// points.push(insterection);
isInside = true;
@@ -145,8 +143,8 @@ export const insertEdge = function(elem, edge, clusterDb) {
}
if (edge.fromCluster) {
logger.info('edge', edge);
logger.info('from cluster', clusterDb[edge.toCluster]);
// logger.info('edge', edge);
// logger.info('from cluster', clusterDb[edge.toCluster]);
const updatedPoints = [];
let lastPointOutside;
let isInside = false;
@@ -155,7 +153,7 @@ export const insertEdge = function(elem, edge, clusterDb) {
const node = clusterDb[edge.fromCluster].node;
if (!outsideNode(node, point) && !isInside) {
logger.info('inside', edge.toCluster, point);
// logger.info('inside', edge.toCluster, point);
// First point inside the rect
const insterection = intersection(node, lastPointOutside, point);
@@ -165,7 +163,7 @@ export const insertEdge = function(elem, edge, clusterDb) {
isInside = true;
} else {
// at the outside
logger.info('Outside point', point);
// logger.info('Outside point', point);
if (!isInside) updatedPoints.unshift(point);
}
lastPointOutside = point;
@@ -173,9 +171,9 @@ export const insertEdge = function(elem, edge, clusterDb) {
points = updatedPoints;
}
logger.info('Poibts', points);
// logger.info('Poibts', points);
logger.info('Edge', edge);
// logger.info('Edge', edge);
// The data for our line
const lineData = points.filter(p => !Number.isNaN(p.y));
@@ -188,8 +186,8 @@ export const insertEdge = function(elem, edge, clusterDb) {
})
.y(function(d) {
return d.y;
});
// .curve(d3.curveBasis);
})
.curve(d3.curveBasis);
const svgPath = elem
.append('path')
@@ -219,7 +217,7 @@ export const insertEdge = function(elem, edge, clusterDb) {
url = url.replace(/\(/g, '\\(');
url = url.replace(/\)/g, '\\)');
}
logger.info('arrowType', edge.arrowType);
// logger.info('arrowType', edge.arrowType);
switch (edge.arrowType) {
case 'arrow_cross':
svgPath.attr('marker-end', 'url(' + url + '#' + 'crossEnd' + ')');