mirrors
/
mermaid
mirror of https://github.com/mermaid-js/mermaid.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix for Edge label positioning

This commit is contained in:
Ashish Jain 2020-08-27 19:59:30 +02:00
parent 89b4f84b0a
commit a20aa472d6
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,28 +103,30 @@ export const insertEdgeLabel = (elem, edge) => {
}
};
export const positionEdgeLabel = (edge, points) => {
export const positionEdgeLabel = (edge, paths) => {
logger.info('Moving label', edge.id, edge.label, edgeLabels[edge.id]);
let path = paths.updatedPath ? paths.updatedPath : paths.originalPath;
if (edge.label) {
const el = edgeLabels[edge.id];
let x = edge.x;
let y = edge.y;
if (points) {
if (path) {
// debugger;
const pos = utils.calcLabelPosition(points);
const pos = utils.calcLabelPosition(path);
x = pos.x;
y = pos.y;
}
el.attr('transform', 'translate(' + x + ', ' + y + ')');
}
//let path = paths.updatedPath ? paths.updatedPath : paths.originalPath;
if (edge.startLabelLeft) {
const el = terminalLabels[edge.id].startLeft;
let x = edge.x;
let y = edge.y;
if (points) {
if (path) {
// debugger;
const pos = utils.calcTerminalLabelPosition(0, 'start_left', points);
const pos = utils.calcTerminalLabelPosition(0, 'start_left', path);
x = pos.x;
y = pos.y;
}
@ -134,9 +136,9 @@ export const positionEdgeLabel = (edge, points) => {
const el = terminalLabels[edge.id].startRight;
let x = edge.x;
let y = edge.y;
if (points) {
if (path) {
// debugger;
const pos = utils.calcTerminalLabelPosition(0, 'start_right', points);
const pos = utils.calcTerminalLabelPosition(0, 'start_right', path);
x = pos.x;
y = pos.y;
}
@ -146,9 +148,9 @@ export const positionEdgeLabel = (edge, points) => {
const el = terminalLabels[edge.id].endLeft;
let x = edge.x;
let y = edge.y;
if (points) {
if (path) {
// debugger;
const pos = utils.calcTerminalLabelPosition(0, 'end_left', points);
const pos = utils.calcTerminalLabelPosition(0, 'end_left', path);
x = pos.x;
y = pos.y;
}
@ -158,9 +160,9 @@ export const positionEdgeLabel = (edge, points) => {
const el = terminalLabels[edge.id].endRight;
let x = edge.x;
let y = edge.y;
if (points) {
if (path) {
// debugger;
const pos = utils.calcTerminalLabelPosition(0, 'end_right', points);
const pos = utils.calcTerminalLabelPosition(0, 'end_right', path);
x = pos.x;
y = pos.y;
}
@ -465,10 +467,10 @@ export const insertEdge = function(elem, e, edge, clusterDb, diagramType, graph)
break;
default:
}
let paths = {};
if (pointsHasChanged) {
return points;
} else {
return edge.points;
paths.updatedPath = points;
}
paths.originalPath = edge.points;
return paths;
};

4
src/dagre-wrapper/index.js
View File

@ -124,8 +124,8 @@ const recursiveRender = (_elem, graph, diagramtype, parentCluster) => {
const edge = graph.edge(e);
log.info('Edge ' + e.v + ' -> ' + e.w + ': ' + JSON.stringify(edge), edge);
const updatedPath = insertEdge(edgePaths, e, edge, clusterDb, diagramtype, graph);
positionEdgeLabel(edge, updatedPath);
const paths = insertEdge(edgePaths, e, edge, clusterDb, diagramtype, graph);
positionEdgeLabel(edge, paths);
});
return elem;