octoleo/plantuml
1
0
Fork 0
mirror of https://github.com/octoleo/plantuml.git synced 2024-11-30 00:33:53 +00:00
Code Issues Releases Wiki Activity

Move all ImageBuilder border related code into maybeDrawBorder() method.

Browse Source
This commit is contained in:
matthew16550 2021-04-07 13:01:15 +10:00
parent ee0503cbe5
commit f0e978de36
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/net/sourceforge/plantuml/ugraphic/ImageBuilder.java
View File

@ -112,9 +112,6 @@ public class ImageBuilder {
private Animation animation; private Animation animation;
private boolean annotations; private boolean annotations;
private HColor backcolor = HColorUtils.WHITE; private HColor backcolor = HColorUtils.WHITE;
private HColor borderColor;
private double borderCorner;
private UStroke borderStroke;
private ColorMapper colorMapper = new ColorMapperIdentity(); private ColorMapper colorMapper = new ColorMapperIdentity();
private Dimension2D dimension; private Dimension2D dimension;
private int dpi = 96; private int dpi = 96;
@ -128,6 +125,7 @@ public class ImageBuilder {
private String preserveAspectRatio; private String preserveAspectRatio;
private Scale scale; private Scale scale;
private long seed = 42; private long seed = 42;
private ISkinParam skinParam;
private int status = 0; private int status = 0;
private SvgCharSizeHack svgCharSizeHack = SvgCharSizeHack.NO_HACK; private SvgCharSizeHack svgCharSizeHack = SvgCharSizeHack.NO_HACK;
private boolean svgDimensionStyle = true; private boolean svgDimensionStyle = true;
@ -217,13 +215,10 @@ public class ImageBuilder {
} }
public ImageBuilder styled(TitledDiagram diagram) { public ImageBuilder styled(TitledDiagram diagram) {
final ISkinParam skinParam = diagram.getSkinParam(); skinParam = diagram.getSkinParam();
animation = diagram.getAnimation(); animation = diagram.getAnimation();
annotations = true; annotations = true;
backcolor = calculateBackColor(diagram); backcolor = calculateBackColor(diagram);
borderColor = new Rose().getHtmlColor(skinParam, ColorParam.diagramBorder);
borderCorner = skinParam.getRoundCorner(CornerParam.diagramBorder, null);
borderStroke = calculateBorderStroke(borderColor, skinParam);
colorMapper = skinParam.getColorMapper(); colorMapper = skinParam.getColorMapper();
dpi = skinParam.getDpi(); dpi = skinParam.getDpi();
handwritten = skinParam.handwritten(); handwritten = skinParam.handwritten();
@ -285,14 +280,7 @@ public class ImageBuilder {
final UGraphic2 ug = createUGraphic(fileFormatOption, dim, animationArg, dx, dy); final UGraphic2 ug = createUGraphic(fileFormatOption, dim, animationArg, dx, dy);
UGraphic ug2 = ug; UGraphic ug2 = ug;
maybeDrawBorder(ug, dim);
if (borderStroke != null) {
final HColor color = borderColor == null ? HColorUtils.BLACK : borderColor;
final double width = dim.getWidth() - borderStroke.getThickness();
final double height = dim.getHeight() - borderStroke.getThickness();
final URectangle shape = new URectangle(width, height).rounded(borderCorner);
ug2.apply(color).apply(borderStroke).draw(shape);
}
if (randomPixel) { if (randomPixel) {
drawRandomPoint(ug2); drawRandomPoint(ug2);
} }
@ -313,6 +301,21 @@ public class ImageBuilder {
return createImageData(dim); return createImageData(dim);
} }
private void maybeDrawBorder(UGraphic ug, Dimension2D dim) {
if (skinParam == null) return;
final HColor color = new Rose().getHtmlColor(skinParam, ColorParam.diagramBorder);
UStroke stroke = skinParam.getThickness(LineParam.diagramBorder, null);
if (stroke == null && color != null) stroke = new UStroke();
if (stroke == null) return;
final URectangle rectangle = new URectangle(dim.getWidth() - stroke.getThickness(), dim.getHeight() - stroke.getThickness())
.rounded(skinParam.getRoundCorner(CornerParam.diagramBorder, null));
ug.apply(color == null ? HColorUtils.BLACK : color).apply(stroke).draw(rectangle);
}
private void drawRandomPoint(UGraphic ug2) { private void drawRandomPoint(UGraphic ug2) {
final Random rnd = new Random(); final Random rnd = new Random();
final int red = rnd.nextInt(40); final int red = rnd.nextInt(40);
@ -501,11 +504,6 @@ public class ImageBuilder {
return diagram.getSkinParam().getBackgroundColor(false); return diagram.getSkinParam().getBackgroundColor(false);
} }
private static UStroke calculateBorderStroke(HColor borderColor, ISkinParam skinParam) {
final UStroke thickness = skinParam.getThickness(LineParam.diagramBorder, null);
return (thickness == null && borderColor != null) ? new UStroke() : thickness;
}
private String calculateHoverPathColor(ISkinParam skinParam) { private String calculateHoverPathColor(ISkinParam skinParam) {
if (fileFormatOption.getHoverColor() != null) { if (fileFormatOption.getHoverColor() != null) {
return fileFormatOption.getHoverColor(); return fileFormatOption.getHoverColor();