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

Fixed printing togethers in nested groups

Browse Source
This commit is contained in:
Kálmán Vince 2023-08-04 00:32:23 +02:00
parent 719927895b
commit 5096c1b9a4
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/net/sourceforge/plantuml/svek/Cluster.java
View File

@ -495,7 +495,7 @@ public class Cluster implements Moveable {
for (Cluster child : children) for (Cluster child : children)
if (child.group.getTogether() == together) if (child.group.getTogether() == together)
child.printInternal(sb, lines, stringBounder, dotMode, graphvizVersion, type, together); child.printInternal(sb, lines, stringBounder, dotMode, graphvizVersion, type);
for (Together otherTogether : otherTogethers) for (Together otherTogether : otherTogethers)
if (otherTogether.getParent() == together) if (otherTogether.getParent() == together)
@ -507,7 +507,7 @@ public class Cluster implements Moveable {
} }
public SvekNode printCluster2(StringBuilder sb, Collection<SvekLine> lines, StringBounder stringBounder, public SvekNode printCluster2(StringBuilder sb, Collection<SvekLine> lines, StringBounder stringBounder,
DotMode dotMode, GraphvizVersion graphvizVersion, UmlDiagramType type, Together parentTogether) { DotMode dotMode, GraphvizVersion graphvizVersion, UmlDiagramType type) {
SvekNode added = null; SvekNode added = null;
final Collection<Together> togethers = new LinkedHashSet<>(); final Collection<Together> togethers = new LinkedHashSet<>();
@ -526,7 +526,7 @@ public class Cluster implements Moveable {
addTogetherWithParents(togethers, child.group.getTogether()); addTogetherWithParents(togethers, child.group.getTogether());
for (Together together : togethers) for (Together together : togethers)
if (together.getParent() == parentTogether) if (together.getParent() == null)
printTogether(together, togethers, sb, nodesOrderedWithoutTop, stringBounder, lines, dotMode, graphvizVersion, type); printTogether(together, togethers, sb, nodesOrderedWithoutTop, stringBounder, lines, dotMode, graphvizVersion, type);
if (skinParam.useRankSame() && dotMode != DotMode.NO_LEFT_RIGHT_AND_XLABEL if (skinParam.useRankSame() && dotMode != DotMode.NO_LEFT_RIGHT_AND_XLABEL
@ -535,7 +535,7 @@ public class Cluster implements Moveable {
for (Cluster child : children) for (Cluster child : children)
if (child.group.getTogether() == null) if (child.group.getTogether() == null)
child.printInternal(sb, lines, stringBounder, dotMode, graphvizVersion, type, parentTogether); child.printInternal(sb, lines, stringBounder, dotMode, graphvizVersion, type);
return added; return added;
} }
@ -561,12 +561,12 @@ public class Cluster implements Moveable {
} }
for (Cluster child : getChildren()) for (Cluster child : getChildren())
child.printInternal(sb, lines, stringBounder, dotMode, graphvizVersion, type, null); child.printInternal(sb, lines, stringBounder, dotMode, graphvizVersion, type);
} }
private void printInternal(StringBuilder sb, Collection<SvekLine> lines, StringBounder stringBounder, private void printInternal(StringBuilder sb, Collection<SvekLine> lines, StringBounder stringBounder,
DotMode dotMode, GraphvizVersion graphvizVersion, UmlDiagramType type, Together parentTogether) { DotMode dotMode, GraphvizVersion graphvizVersion, UmlDiagramType type) {
new ClusterDotString(this, skinParam).printInternal(sb, lines, stringBounder, dotMode, graphvizVersion, type, parentTogether); new ClusterDotString(this, skinParam).printInternal(sb, lines, stringBounder, dotMode, graphvizVersion, type);
} }
private void appendRankSame(StringBuilder sb, Collection<SvekLine> lines) { private void appendRankSame(StringBuilder sb, Collection<SvekLine> lines) {

7
src/net/sourceforge/plantuml/svek/ClusterDotString.java
View File

@ -46,7 +46,6 @@ import java.util.Set;
import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.StringUtils;
import net.sourceforge.plantuml.abel.EntityPosition; import net.sourceforge.plantuml.abel.EntityPosition;
import net.sourceforge.plantuml.abel.Together;
import net.sourceforge.plantuml.decoration.symbol.USymbols; import net.sourceforge.plantuml.decoration.symbol.USymbols;
import net.sourceforge.plantuml.dot.GraphvizVersion; import net.sourceforge.plantuml.dot.GraphvizVersion;
import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.klimt.font.StringBounder;
@ -72,7 +71,7 @@ public class ClusterDotString {
} }
void printInternal(StringBuilder sb, Collection<SvekLine> lines, StringBounder stringBounder, DotMode dotMode, void printInternal(StringBuilder sb, Collection<SvekLine> lines, StringBounder stringBounder, DotMode dotMode,
GraphvizVersion graphvizVersion, UmlDiagramType type, Together parentTogether) { GraphvizVersion graphvizVersion, UmlDiagramType type) {
if (cluster.diagram.getPragma().useKermor()) { if (cluster.diagram.getPragma().useKermor()) {
new ClusterDotStringKermor(cluster, skinParam).printInternal(sb, lines, stringBounder, dotMode, new ClusterDotStringKermor(cluster, skinParam).printInternal(sb, lines, stringBounder, dotMode,
graphvizVersion, type); graphvizVersion, type);
@ -82,7 +81,7 @@ public class ClusterDotString {
if (packed) { if (packed) {
cluster.printCluster1(sb, lines, stringBounder); cluster.printCluster1(sb, lines, stringBounder);
final SvekNode added = cluster.printCluster2(sb, lines, stringBounder, dotMode, graphvizVersion, type, parentTogether); final SvekNode added = cluster.printCluster2(sb, lines, stringBounder, dotMode, graphvizVersion, type);
return; return;
} }
@ -171,7 +170,7 @@ public class ClusterDotString {
// ----------- // -----------
cluster.printCluster1(sb, lines, stringBounder); cluster.printCluster1(sb, lines, stringBounder);
final SvekNode added = cluster.printCluster2(sb, lines, stringBounder, dotMode, graphvizVersion, type, parentTogether); final SvekNode added = cluster.printCluster2(sb, lines, stringBounder, dotMode, graphvizVersion, type);
if (entityPositionsExceptNormal.size() > 0) if (entityPositionsExceptNormal.size() > 0)
if (hasPort()) { if (hasPort()) {
sb.append(empty() + " [shape=rect,width=.01,height=.01,label="); sb.append(empty() + " [shape=rect,width=.01,height=.01,label=");

2
src/net/sourceforge/plantuml/svek/DotStringFactory.java
View File

@ -214,7 +214,7 @@ public class DotStringFactory implements Moveable {
line.appendLine(getGraphvizVersion(), sb, dotMode, dotSplines); line.appendLine(getGraphvizVersion(), sb, dotMode, dotSplines);
root.printCluster2(sb, bibliotekon.allLines(), stringBounder, dotMode, getGraphvizVersion(), root.printCluster2(sb, bibliotekon.allLines(), stringBounder, dotMode, getGraphvizVersion(),
umlDiagramType, null); umlDiagramType);
for (SvekLine line : bibliotekon.lines1()) for (SvekLine line : bibliotekon.lines1())
line.appendLine(getGraphvizVersion(), sb, dotMode, dotSplines); line.appendLine(getGraphvizVersion(), sb, dotMode, dotSplines);