octoleo/plantuml
1
0
Fork 0
mirror of https://github.com/octoleo/plantuml.git synced 2024-12-22 10:59:01 +00:00
Code Issues Releases Wiki Activity

Improve ELK support (Label and orientation)

Browse Source
This commit is contained in:
Arnaud Roques 2021-04-15 18:49:28 +02:00
parent 320ab186b4
commit cb8cd3492c
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/net/sourceforge/plantuml/elk/CucaDiagramFileMakerElk.java
View File

@ -49,6 +49,8 @@ import java.util.Map.Entry;
import org.eclipse.elk.core.RecursiveGraphLayoutEngine; import org.eclipse.elk.core.RecursiveGraphLayoutEngine;
import org.eclipse.elk.core.math.ElkPadding; import org.eclipse.elk.core.math.ElkPadding;
import org.eclipse.elk.core.options.CoreOptions; import org.eclipse.elk.core.options.CoreOptions;
import org.eclipse.elk.core.options.Direction;
import org.eclipse.elk.core.options.EdgeType;
import org.eclipse.elk.core.options.NodeLabelPlacement; import org.eclipse.elk.core.options.NodeLabelPlacement;
import org.eclipse.elk.core.options.SizeConstraint; import org.eclipse.elk.core.options.SizeConstraint;
import org.eclipse.elk.core.options.SizeOptions; import org.eclipse.elk.core.options.SizeOptions;
@ -169,6 +171,13 @@ public class CucaDiagramFileMakerElk implements CucaDiagramFileMaker {
final ElkEdge edge = ent.getValue(); final ElkEdge edge = ent.getValue();
new ElkPath(link, edge, diagram, getLabel(link), getQualifier(link, 1), getQualifier(link, 2)) new ElkPath(link, edge, diagram, getLabel(link), getQualifier(link, 1), getQualifier(link, 2))
.drawU(ug); .drawU(ug);
if (Display.isNull(link.getLabel()) == false) {
final ElkLabel label = edge.getLabels().get(0);
final double x = label.getX();
final double y = label.getY();
final TextBlock labelLink = getLabel(link);
labelLink.drawU(ug.apply(new UTranslate(x, y)));
}
} }
} }
@ -192,6 +201,7 @@ public class CucaDiagramFileMakerElk implements CucaDiagramFileMaker {
try { try {
final ElkNode root = ElkGraphUtil.createGraph(); final ElkNode root = ElkGraphUtil.createGraph();
root.setProperty(CoreOptions.DIRECTION, Direction.DOWN);
// This padding setting have no impact ? // This padding setting have no impact ?
final ElkPadding labelPadding = new ElkPadding(100.0); final ElkPadding labelPadding = new ElkPadding(100.0);
@ -214,7 +224,7 @@ public class CucaDiagramFileMakerElk implements CucaDiagramFileMaker {
// I don't know why we have to do this hack, but somebody has to fix it // I don't know why we have to do this hack, but somebody has to fix it
final double VERY_STRANGE_OFFSET = 10; final double VERY_STRANGE_OFFSET = 10;
label.setDimensions(dimension.getWidth() - VERY_STRANGE_OFFSET, dimension.getHeight()); label.setDimensions(dimension.getWidth(), dimension.getHeight() - VERY_STRANGE_OFFSET);
// No idea of what we are doing here :-) // No idea of what we are doing here :-)
label.setProperty(CoreOptions.NODE_LABELS_PLACEMENT, EnumSet.of(NodeLabelPlacement.INSIDE, label.setProperty(CoreOptions.NODE_LABELS_PLACEMENT, EnumSet.of(NodeLabelPlacement.INSIDE,
@ -231,6 +241,16 @@ public class CucaDiagramFileMakerElk implements CucaDiagramFileMaker {
for (final Link link : diagram.getLinks()) { for (final Link link : diagram.getLinks()) {
final ElkEdge edge = ElkGraphUtil.createEdge(root); final ElkEdge edge = ElkGraphUtil.createEdge(root);
if (Display.isNull(link.getLabel()) == false) {
final ElkLabel edgeLabel = ElkGraphUtil.createLabel(edge);
final TextBlock labelLink = getLabel(link);
final Dimension2D labelLinkDim = labelLink.calculateDimension(stringBounder);
edgeLabel.setText("X");
edgeLabel.setDimensions(labelLinkDim.getWidth(), labelLinkDim.getHeight());
edge.setProperty(CoreOptions.EDGE_LABELS_INLINE, true);
edge.setProperty(CoreOptions.EDGE_TYPE, EdgeType.ASSOCIATION);
}
edge.getSources().add(nodes.get(link.getEntity1())); edge.getSources().add(nodes.get(link.getEntity1()));
edge.getTargets().add(nodes.get(link.getEntity2())); edge.getTargets().add(nodes.get(link.getEntity2()));
edges.put(link, edge); edges.put(link, edge);

2
src/net/sourceforge/plantuml/version/Version.java
View File

@ -80,7 +80,7 @@ public class Version {
} }
public static int beta() { public static int beta() {
final int beta = 4; final int beta = 5;
return beta; return beta;
} }