Skip to content

Commit

Permalink
fix: improve local style for activity diagrams
Browse files Browse the repository at this point in the history
  • Loading branch information
arnaudroques committed Dec 18, 2023
1 parent cc80d86 commit b65aaff
Show file tree
Hide file tree
Showing 10 changed files with 240 additions and 30 deletions.
11 changes: 7 additions & 4 deletions src/net/sourceforge/plantuml/activitydiagram3/InstructionIf.java
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
import net.sourceforge.plantuml.sequencediagram.NoteType;
import net.sourceforge.plantuml.stereo.Stereotype;
import net.sourceforge.plantuml.style.ISkinParam;
import net.sourceforge.plantuml.style.StyleBuilder;
import net.sourceforge.plantuml.url.Url;

public class InstructionIf extends WithNote implements Instruction, InstructionCollection {
Expand All @@ -77,6 +78,7 @@ public class InstructionIf extends WithNote implements Instruction, InstructionC
private final Stereotype stereotype;

private final Swimlane swimlane;
private final StyleBuilder currentStyleBuilder;

@Override
public boolean containsBreak() {
Expand All @@ -98,8 +100,9 @@ public InstructionIf(Swimlane swimlane, Instruction parent, Display labelTest, L
this.skinParam = skinParam;
this.topInlinkRendering = Objects.requireNonNull(inlinkRendering);
this.swimlane = swimlane;
this.thens.add(new Branch(skinParam.getCurrentStyleBuilder(), swimlane, whenThen, labelTest, color,
LinkRendering.none(), stereotype));
this.currentStyleBuilder = skinParam.getCurrentStyleBuilder();
this.thens.add(new Branch(currentStyleBuilder, swimlane, whenThen, labelTest, color, LinkRendering.none(),
stereotype));
this.current = this.thens.get(0);
}

Expand Down Expand Up @@ -138,12 +141,12 @@ public Ftile createFtile(FtileFactory factory) {
branch.updateFtile(factory);

if (elseBranch == null)
this.elseBranch = new Branch(skinParam.getCurrentStyleBuilder(), swimlane, LinkRendering.none(),
this.elseBranch = new Branch(currentStyleBuilder, swimlane, LinkRendering.none(),
Display.NULL, null, LinkRendering.none(), stereotype);

elseBranch.updateFtile(factory);
Ftile result = factory.createIf(swimlane, thens, elseBranch, outColor, topInlinkRendering, url,
getPositionedNotes(), stereotype);
getPositionedNotes(), stereotype, currentStyleBuilder);
// if (getPositionedNotes().size() > 0)
// result = FtileWithNoteOpale.create(result, getPositionedNotes(), false, VerticalAlignment.CENTER);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
import net.sourceforge.plantuml.stereo.Stereotype;
import net.sourceforge.plantuml.style.ISkinParam;
import net.sourceforge.plantuml.style.Style;
import net.sourceforge.plantuml.style.StyleBuilder;
import net.sourceforge.plantuml.url.Url;

public interface FtileFactory {
Expand Down Expand Up @@ -89,7 +90,8 @@ public Ftile createWhile(LinkRendering outColor, Swimlane swimlane, Ftile whileB
HColor color, Instruction specialOut, Ftile backward, LinkRendering incoming1, LinkRendering incoming2);

public Ftile createIf(Swimlane swimlane, List<Branch> thens, Branch elseBranch, LinkRendering outColor,
LinkRendering topInlinkRendering, Url url, Collection<PositionedNote> notes, Stereotype stereotype);
LinkRendering topInlinkRendering, Url url, Collection<PositionedNote> notes, Stereotype stereotype,
StyleBuilder currentStyleBuilder);

public Ftile createSwitch(Swimlane swimlane, List<Branch> branches, LinkRendering afterEndwhile,
LinkRendering topInlinkRendering, Display labelTest);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
import net.sourceforge.plantuml.style.ISkinParam;
import net.sourceforge.plantuml.style.SName;
import net.sourceforge.plantuml.style.Style;
import net.sourceforge.plantuml.style.StyleBuilder;
import net.sourceforge.plantuml.style.StyleSignatureBasic;
import net.sourceforge.plantuml.url.Url;

Expand Down Expand Up @@ -188,8 +189,10 @@ public Ftile createWhile(LinkRendering outColor, Swimlane swimlane, Ftile whileB

@Override
public Ftile createIf(Swimlane swimlane, List<Branch> thens, Branch elseBranch, LinkRendering afterEndwhile,
LinkRendering topInlinkRendering, Url url, Collection<PositionedNote> notes, Stereotype stereotype) {
return factory.createIf(swimlane, thens, elseBranch, afterEndwhile, topInlinkRendering, url, notes, stereotype);
LinkRendering topInlinkRendering, Url url, Collection<PositionedNote> notes, Stereotype stereotype,
StyleBuilder currentStyleBuilder) {
return factory.createIf(swimlane, thens, elseBranch, afterEndwhile, topInlinkRendering, url, notes, stereotype,
currentStyleBuilder);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
import net.sourceforge.plantuml.stereo.Stereotype;
import net.sourceforge.plantuml.style.PName;
import net.sourceforge.plantuml.style.Style;
import net.sourceforge.plantuml.style.StyleBuilder;
import net.sourceforge.plantuml.svek.ConditionEndStyle;
import net.sourceforge.plantuml.svek.ConditionStyle;
import net.sourceforge.plantuml.url.Url;
Expand All @@ -66,15 +67,16 @@ public FtileFactoryDelegatorIf(FtileFactory factory, Pragma pragma) {

@Override
public Ftile createIf(Swimlane swimlane, List<Branch> thens, Branch elseBranch, LinkRendering afterEndwhile,
LinkRendering topInlinkRendering, Url url, Collection<PositionedNote> notes, Stereotype stereotype) {
LinkRendering topInlinkRendering, Url url, Collection<PositionedNote> notes, Stereotype stereotype,
StyleBuilder currentStyleBuilder) {

final ConditionStyle conditionStyle = skinParam().getConditionStyle();
final ConditionEndStyle conditionEndStyle = skinParam().getConditionEndStyle();
final Branch branch0 = thens.get(0);

final Style styleArrow = getDefaultStyleDefinitionArrow().getMergedStyle(skinParam().getCurrentStyleBuilder());
final Style styleArrow = getDefaultStyleDefinitionArrow().getMergedStyle(currentStyleBuilder);
final Style styleDiamond = getDefaultStyleDefinitionDiamond().withTOBECHANGED(stereotype)
.getMergedStyle(skinParam().getCurrentStyleBuilder());
.getMergedStyle(currentStyleBuilder);
final HColor backColor = branch0.getColor() == null
? styleDiamond.value(PName.BackGroundColor).asColor(skinParam().getIHtmlColorSet())
: branch0.getColor();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,8 @@ public Ftile createWhile(LinkRendering afterEndwhile, Swimlane swimlane, Ftile w

@Override
public Ftile createIf(Swimlane swimlane, List<Branch> thens, Branch elseBranch, LinkRendering afterEndwhile,
LinkRendering topInlinkRendering, Url url, Collection<PositionedNote> notes, Stereotype stereotype) {
LinkRendering topInlinkRendering, Url url, Collection<PositionedNote> notes, Stereotype stereotype,
StyleBuilder currentStyleBuilder) {
final List<Ftile> ftiles = new ArrayList<>();
for (Branch branch : thens)
ftiles.add(branch.getFtile());
Expand Down
143 changes: 143 additions & 0 deletions src/net/sourceforge/plantuml/ebnf/ETileNamedGroup.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,143 @@
/* ========================================================================
* PlantUML : a free UML diagram generator
* ========================================================================
*
* (C) Copyright 2009-2020, Arnaud Roques
*
* Project Info: https://plantuml.com
*
* If you like this project or if you find it useful, you can support us at:
*
* https://plantuml.com/patreon (only 1$ per month!)
* https://plantuml.com/paypal
*
* This file is part of PlantUML.
*
* PlantUML is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* PlantUML distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
* License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA.
*
*
* Original Author: Arnaud Roques
*
*
*/
package net.sourceforge.plantuml.ebnf;

import net.sourceforge.plantuml.klimt.UTranslate;
import net.sourceforge.plantuml.klimt.color.HColor;
import net.sourceforge.plantuml.klimt.color.HColorSet;
import net.sourceforge.plantuml.klimt.color.NoSuchColorException;
import net.sourceforge.plantuml.klimt.drawing.UGraphic;
import net.sourceforge.plantuml.klimt.font.FontConfiguration;
import net.sourceforge.plantuml.klimt.font.StringBounder;
import net.sourceforge.plantuml.klimt.geom.XDimension2D;
import net.sourceforge.plantuml.klimt.shape.URectangle;
import net.sourceforge.plantuml.klimt.shape.UText;
import net.sourceforge.plantuml.style.ISkinParam;

public class ETileNamedGroup extends ETile {

private final ETile orig;
private final ISkinParam skinParam;
private String commentAbove;
private String commentBelow;
private final HColorSet colorSet;
private final double deltax = 10;
private final double deltay1 = 10;
private final double deltay2 = 10;
private final UText groupName;

private final FontConfiguration fc;

public ETileNamedGroup(ETile orig, FontConfiguration fc, HColorSet colorSet, ISkinParam skinParam, String name) {
this.skinParam = skinParam;
this.orig = orig;
this.fc = fc;
this.colorSet = colorSet;
this.groupName = UText.build(name, fc);

}

@Override
public double getH1(StringBounder stringBounder) {
// final TextBlock note = getNoteAbove(stringBounder);
return deltay1 + orig.getH1(stringBounder);
}

@Override
public double getH2(StringBounder stringBounder) {
// final TextBlock note = getNoteBelow(stringBounder);
return orig.getH2(stringBounder) + deltay2;
}

@Override
public double getWidth(StringBounder stringBounder) {
return orig.getWidth(stringBounder) + 2 * deltax;
}

@Override
public void drawU(UGraphic ug) {
final StringBounder stringBounder = ug.getStringBounder();
final XDimension2D dim = calculateDimension(stringBounder);

try {
final HColor background = colorSet.getColor("#E8E8FF");
final UGraphic ugBack = ug.apply(background).apply(background.bg());
ugBack.draw(URectangle.build(dim));
final XDimension2D dimText = stringBounder.calculateDimension(fc.getFont(), groupName.getText());
ugBack.apply(UTranslate.dy(-dimText.getHeight())).draw(URectangle.build(dimText.delta(10, 0)));

} catch (NoSuchColorException e) {
e.printStackTrace();
}
final double linePos = getH1(stringBounder);
drawHline(ug, linePos, 0, deltax);
drawHline(ug, linePos, dim.getWidth() - deltax, dim.getWidth());

orig.drawU(ug.apply(new UTranslate(deltax, deltay1)));
ug.apply(UTranslate.dx(5)).draw(groupName);

}

@Override
public void push(ETile tile) {
throw new UnsupportedOperationException();
}

// @Override
// protected void addCommentAbove(String comment) {
// this.commentAbove = comment;
// }
//
// @Override
// protected void addCommentBelow(String comment) {
// this.commentBelow = comment;
// }

// private TextBlock getNoteAbove(StringBounder stringBounder) {
// if (commentAbove == null)
// return TextBlockUtils.EMPTY_TEXT_BLOCK;
// final FloatingNote note = FloatingNote.create(Display.getWithNewlines(commentAbove), skinParam, SName.ebnf);
// return TextBlockUtils.withMargin(note, 0, 0, 0, 10);
// }
//
// private TextBlock getNoteBelow(StringBounder stringBounder) {
// if (commentBelow == null)
// return TextBlockUtils.EMPTY_TEXT_BLOCK;
// final FloatingNote note = FloatingNote.create(Display.getWithNewlines(commentBelow), skinParam, SName.ebnf);
// return TextBlockUtils.withMargin(note, 0, 0, 10, 0);
// }

}
11 changes: 8 additions & 3 deletions src/net/sourceforge/plantuml/regexdiagram/PSystemRegex.java
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@
import net.sourceforge.plantuml.ebnf.ETileAlternation;
import net.sourceforge.plantuml.ebnf.ETileBox;
import net.sourceforge.plantuml.ebnf.ETileConcatenation;
import net.sourceforge.plantuml.ebnf.ETileNamedGroup;
import net.sourceforge.plantuml.ebnf.ETileOneOrMore;
import net.sourceforge.plantuml.ebnf.ETileOptional;
import net.sourceforge.plantuml.ebnf.ETileZeroOrMore;
import net.sourceforge.plantuml.ebnf.Symbol;
import net.sourceforge.plantuml.ebnf.TextBlockable;
import net.sourceforge.plantuml.klimt.color.HColor;
import net.sourceforge.plantuml.klimt.color.HColorSet;
import net.sourceforge.plantuml.klimt.color.HColors;
Expand All @@ -76,8 +76,6 @@

public class PSystemRegex extends TitledDiagram {

private final List<TextBlockable> expressions = new ArrayList<>();

public PSystemRegex(UmlSource source) {
super(source, UmlDiagramType.REGEX, null);
final ISkinParam skinParam = getSkinParam();
Expand Down Expand Up @@ -164,6 +162,8 @@ else if (token.getType() == ReTokenType.ESCAPED_CHAR)
push(token, Symbol.TERMINAL_STRING1);
else if (token.getType() == ReTokenType.GROUP)
push(token, Symbol.SPECIAL_SEQUENCE);
else if (token.getType() == ReTokenType.NAMED_GROUP)
namedGroup(token.getData());
else if (token.getType() == ReTokenType.CLASS)
push(token, Symbol.LITTERAL);
else if (token.getType() == ReTokenType.ANCHOR)
Expand Down Expand Up @@ -205,6 +205,11 @@ private void push(ReToken element, Symbol type) {
stack.addFirst(new ETileBox(element.getData(), type, fontConfiguration, style, colorSet, getSkinParam()));
}

private void namedGroup(String name) {
final ETile arg1 = stack.removeFirst();
stack.addFirst(new ETileNamedGroup(arg1, fontConfiguration, colorSet, getSkinParam(), name));
}

private void repetitionZeroOrMore(boolean isCompact) {
final ETile arg1 = stack.removeFirst();
if (isCompact)
Expand Down
3 changes: 3 additions & 0 deletions src/net/sourceforge/plantuml/regexdiagram/ReTokenType.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,15 @@ public enum ReTokenType {
QUANTIFIER, //
ANCHOR, //
GROUP, //
NAMED_GROUP, //
ALTERNATIVE, //
PARENTHESIS_OPEN, //
PARENTHESIS_CLOSE, //
CONCATENATION_IMPLICIT;

static public boolean needImplicitConcatenation(ReTokenType token1, ReTokenType token2) {
if (token1 == NAMED_GROUP)
return false;
if (token1 == ALTERNATIVE)
return false;
if (token2 == ALTERNATIVE)
Expand Down
Loading

0 comments on commit b65aaff

Please sign in to comment.