mirror of
https://github.com/octoleo/plantuml.git
synced 2024-12-23 03:19:06 +00:00
feat: adding action and process keywords
https://github.com/plantuml/plantuml/issues/1631
This commit is contained in:
parent
533c27cba5
commit
d07cda5f5f
@ -0,0 +1,113 @@
|
|||||||
|
/* ========================================================================
|
||||||
|
* PlantUML : a free UML diagram generator
|
||||||
|
* ========================================================================
|
||||||
|
*
|
||||||
|
* (C) Copyright 2009-2024, 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.decoration.symbol;
|
||||||
|
|
||||||
|
import net.sourceforge.plantuml.klimt.Fashion;
|
||||||
|
import net.sourceforge.plantuml.klimt.Shadowable;
|
||||||
|
import net.sourceforge.plantuml.klimt.UPath;
|
||||||
|
import net.sourceforge.plantuml.klimt.UTranslate;
|
||||||
|
import net.sourceforge.plantuml.klimt.drawing.UGraphic;
|
||||||
|
import net.sourceforge.plantuml.klimt.drawing.UGraphicStencil;
|
||||||
|
import net.sourceforge.plantuml.klimt.font.StringBounder;
|
||||||
|
import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment;
|
||||||
|
import net.sourceforge.plantuml.klimt.geom.XDimension2D;
|
||||||
|
import net.sourceforge.plantuml.klimt.shape.AbstractTextBlock;
|
||||||
|
import net.sourceforge.plantuml.klimt.shape.TextBlock;
|
||||||
|
import net.sourceforge.plantuml.klimt.shape.TextBlockUtils;
|
||||||
|
import net.sourceforge.plantuml.klimt.shape.UPolygon;
|
||||||
|
import net.sourceforge.plantuml.klimt.shape.URectangle;
|
||||||
|
import net.sourceforge.plantuml.style.SName;
|
||||||
|
|
||||||
|
class USymbolAction extends USymbol {
|
||||||
|
|
||||||
|
private final SName sname;
|
||||||
|
|
||||||
|
public USymbolAction(SName sname) {
|
||||||
|
this.sname = sname;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public SName getSName() {
|
||||||
|
return sname;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void drawAction(UGraphic ug, double width, double height, double shadowing, double roundCorner,
|
||||||
|
double diagonalCorner) {
|
||||||
|
final UPolygon shape = new UPolygon();
|
||||||
|
shape.addPoint(0, 0);
|
||||||
|
shape.addPoint(width - 10, 0);
|
||||||
|
shape.addPoint(width, height / 2);
|
||||||
|
shape.addPoint(width - 10, height);
|
||||||
|
shape.addPoint(0, height);
|
||||||
|
ug.draw(shape);
|
||||||
|
}
|
||||||
|
|
||||||
|
private Margin getMargin() {
|
||||||
|
return new Margin(10, 20, 10, 10);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public TextBlock asSmall(TextBlock name, final TextBlock label, final TextBlock stereotype,
|
||||||
|
final Fashion symbolContext, final HorizontalAlignment stereoAlignment) {
|
||||||
|
return new AbstractTextBlock() {
|
||||||
|
|
||||||
|
public void drawU(UGraphic ug) {
|
||||||
|
final XDimension2D dim = calculateDimension(ug.getStringBounder());
|
||||||
|
ug = UGraphicStencil.create(ug, dim);
|
||||||
|
ug = symbolContext.apply(ug);
|
||||||
|
drawAction(ug, dim.getWidth(), dim.getHeight(), symbolContext.getDeltaShadow(),
|
||||||
|
symbolContext.getRoundCorner(), symbolContext.getDiagonalCorner());
|
||||||
|
final Margin margin = getMargin();
|
||||||
|
final TextBlock tb = TextBlockUtils.mergeTB(stereotype, label, stereoAlignment);
|
||||||
|
tb.drawU(ug.apply(new UTranslate(margin.getX1(), margin.getY1())));
|
||||||
|
}
|
||||||
|
|
||||||
|
public XDimension2D calculateDimension(StringBounder stringBounder) {
|
||||||
|
final XDimension2D dimLabel = label.calculateDimension(stringBounder);
|
||||||
|
final XDimension2D dimStereo = stereotype.calculateDimension(stringBounder);
|
||||||
|
return getMargin().addDimension(dimStereo.mergeTB(dimLabel));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public TextBlock asBig(final TextBlock title, final HorizontalAlignment labelAlignment, final TextBlock stereotype,
|
||||||
|
final double width, final double height, final Fashion symbolContext,
|
||||||
|
final HorizontalAlignment stereoAlignment) {
|
||||||
|
throw new UnsupportedOperationException();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,114 @@
|
|||||||
|
/* ========================================================================
|
||||||
|
* PlantUML : a free UML diagram generator
|
||||||
|
* ========================================================================
|
||||||
|
*
|
||||||
|
* (C) Copyright 2009-2024, 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.decoration.symbol;
|
||||||
|
|
||||||
|
import net.sourceforge.plantuml.klimt.Fashion;
|
||||||
|
import net.sourceforge.plantuml.klimt.Shadowable;
|
||||||
|
import net.sourceforge.plantuml.klimt.UPath;
|
||||||
|
import net.sourceforge.plantuml.klimt.UTranslate;
|
||||||
|
import net.sourceforge.plantuml.klimt.drawing.UGraphic;
|
||||||
|
import net.sourceforge.plantuml.klimt.drawing.UGraphicStencil;
|
||||||
|
import net.sourceforge.plantuml.klimt.font.StringBounder;
|
||||||
|
import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment;
|
||||||
|
import net.sourceforge.plantuml.klimt.geom.XDimension2D;
|
||||||
|
import net.sourceforge.plantuml.klimt.shape.AbstractTextBlock;
|
||||||
|
import net.sourceforge.plantuml.klimt.shape.TextBlock;
|
||||||
|
import net.sourceforge.plantuml.klimt.shape.TextBlockUtils;
|
||||||
|
import net.sourceforge.plantuml.klimt.shape.UPolygon;
|
||||||
|
import net.sourceforge.plantuml.klimt.shape.URectangle;
|
||||||
|
import net.sourceforge.plantuml.style.SName;
|
||||||
|
|
||||||
|
class USymbolProcess extends USymbol {
|
||||||
|
|
||||||
|
private final SName sname;
|
||||||
|
|
||||||
|
public USymbolProcess(SName sname) {
|
||||||
|
this.sname = sname;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public SName getSName() {
|
||||||
|
return sname;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void drawAction(UGraphic ug, double width, double height, double shadowing, double roundCorner,
|
||||||
|
double diagonalCorner) {
|
||||||
|
final UPolygon shape = new UPolygon();
|
||||||
|
shape.addPoint(0, 0);
|
||||||
|
shape.addPoint(width - 10, 0);
|
||||||
|
shape.addPoint(width, height / 2);
|
||||||
|
shape.addPoint(width - 10, height);
|
||||||
|
shape.addPoint(0, height);
|
||||||
|
shape.addPoint(10, height / 2);
|
||||||
|
ug.draw(shape);
|
||||||
|
}
|
||||||
|
|
||||||
|
private Margin getMargin() {
|
||||||
|
return new Margin(20, 20, 10, 10);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public TextBlock asSmall(TextBlock name, final TextBlock label, final TextBlock stereotype,
|
||||||
|
final Fashion symbolContext, final HorizontalAlignment stereoAlignment) {
|
||||||
|
return new AbstractTextBlock() {
|
||||||
|
|
||||||
|
public void drawU(UGraphic ug) {
|
||||||
|
final XDimension2D dim = calculateDimension(ug.getStringBounder());
|
||||||
|
ug = UGraphicStencil.create(ug, dim);
|
||||||
|
ug = symbolContext.apply(ug);
|
||||||
|
drawAction(ug, dim.getWidth(), dim.getHeight(), symbolContext.getDeltaShadow(),
|
||||||
|
symbolContext.getRoundCorner(), symbolContext.getDiagonalCorner());
|
||||||
|
final Margin margin = getMargin();
|
||||||
|
final TextBlock tb = TextBlockUtils.mergeTB(stereotype, label, stereoAlignment);
|
||||||
|
tb.drawU(ug.apply(new UTranslate(margin.getX1(), margin.getY1())));
|
||||||
|
}
|
||||||
|
|
||||||
|
public XDimension2D calculateDimension(StringBounder stringBounder) {
|
||||||
|
final XDimension2D dimLabel = label.calculateDimension(stringBounder);
|
||||||
|
final XDimension2D dimStereo = stereotype.calculateDimension(stringBounder);
|
||||||
|
return getMargin().addDimension(dimStereo.mergeTB(dimLabel));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public TextBlock asBig(final TextBlock title, final HorizontalAlignment labelAlignment, final TextBlock stereotype,
|
||||||
|
final double width, final double height, final Fashion symbolContext,
|
||||||
|
final HorizontalAlignment stereoAlignment) {
|
||||||
|
throw new UnsupportedOperationException();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -70,6 +70,8 @@ public abstract class USymbols {
|
|||||||
public final static USymbol FOLDER = record("FOLDER", new USymbolFolder(SName.folder, false));
|
public final static USymbol FOLDER = record("FOLDER", new USymbolFolder(SName.folder, false));
|
||||||
public final static USymbol FILE = record("FILE", new USymbolFile());
|
public final static USymbol FILE = record("FILE", new USymbolFile());
|
||||||
public final static USymbol RECTANGLE = record("RECTANGLE", new USymbolRectangle(SName.rectangle));
|
public final static USymbol RECTANGLE = record("RECTANGLE", new USymbolRectangle(SName.rectangle));
|
||||||
|
public final static USymbol ACTION = record("ACTION", new USymbolAction(SName.rectangle));
|
||||||
|
public final static USymbol PROCESS = record("PROCESS", new USymbolProcess(SName.rectangle));
|
||||||
public final static USymbol HEXAGON = record("HEXAGON", new USymbolHexagon());
|
public final static USymbol HEXAGON = record("HEXAGON", new USymbolHexagon());
|
||||||
public final static USymbol PERSON = record("PERSON", new USymbolPerson());
|
public final static USymbol PERSON = record("PERSON", new USymbolPerson());
|
||||||
public final static USymbol LABEL = record("LABEL", new USymbolLabel());
|
public final static USymbol LABEL = record("LABEL", new USymbolLabel());
|
||||||
@ -142,6 +144,10 @@ public abstract class USymbols {
|
|||||||
usymbol = USymbols.FRAME;
|
usymbol = USymbols.FRAME;
|
||||||
else if (symbol.equalsIgnoreCase("cloud"))
|
else if (symbol.equalsIgnoreCase("cloud"))
|
||||||
usymbol = USymbols.CLOUD;
|
usymbol = USymbols.CLOUD;
|
||||||
|
else if (symbol.equalsIgnoreCase("action"))
|
||||||
|
usymbol = USymbols.ACTION;
|
||||||
|
else if (symbol.equalsIgnoreCase("process"))
|
||||||
|
usymbol = USymbols.PROCESS;
|
||||||
else if (symbol.equalsIgnoreCase("database"))
|
else if (symbol.equalsIgnoreCase("database"))
|
||||||
usymbol = USymbols.DATABASE;
|
usymbol = USymbols.DATABASE;
|
||||||
else if (symbol.equalsIgnoreCase("queue"))
|
else if (symbol.equalsIgnoreCase("queue"))
|
||||||
|
@ -69,7 +69,7 @@ import net.sourceforge.plantuml.utils.LineLocation;
|
|||||||
|
|
||||||
public class CommandCreateElementFull extends SingleLineCommand2<DescriptionDiagram> {
|
public class CommandCreateElementFull extends SingleLineCommand2<DescriptionDiagram> {
|
||||||
|
|
||||||
public static final String ALL_TYPES = "person|artifact|actor/|actor|folder|card|file|package|rectangle|hexagon|label|node|frame|cloud|database|queue|stack|storage|agent|usecase/|usecase|component|boundary|control|entity|interface|circle|collections|port|portin|portout";
|
public static final String ALL_TYPES = "person|artifact|actor/|actor|folder|card|file|package|rectangle|hexagon|label|node|frame|cloud|action|process|database|queue|stack|storage|agent|usecase/|usecase|component|boundary|control|entity|interface|circle|collections|port|portin|portout";
|
||||||
|
|
||||||
public CommandCreateElementFull() {
|
public CommandCreateElementFull() {
|
||||||
super(getRegexConcat());
|
super(getRegexConcat());
|
||||||
|
@ -1,2 +0,0 @@
|
|||||||
1.2023.6-beta-3
|
|
||||||
1680642535564
|
|
Loading…
Reference in New Issue
Block a user