octoleo/plantuml
1
0
Fork 0
mirror of https://github.com/octoleo/plantuml.git synced 2024-11-29 16:23:55 +00:00
Code Issues Releases Wiki Activity

Infer dpi instead of storing it in ImageBuilder.

Browse Source
This commit is contained in:
matthew16550 2021-04-07 18:46:12 +10:00
parent 81abee58fa
commit c4fe9f4349
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,7 +114,6 @@ public class ImageBuilder {
private HColor backcolor = HColorUtils.WHITE; private HColor backcolor = HColorUtils.WHITE;
private ColorMapper colorMapper = new ColorMapperIdentity(); private ColorMapper colorMapper = new ColorMapperIdentity();
private Dimension2D dimension; private Dimension2D dimension;
private int dpi = 96;
private final FileFormatOption fileFormatOption; private final FileFormatOption fileFormatOption;
private boolean handwritten; private boolean handwritten;
private String hoverPathColorRGB; private String hoverPathColorRGB;
@ -171,6 +170,10 @@ public class ImageBuilder {
return this; return this;
} }
private int getDpi() {
return skinParam == null ? 96 : skinParam.getDpi();
}
public ImageBuilder drawable(UDrawable drawable) { public ImageBuilder drawable(UDrawable drawable) {
this.udrawable = drawable; this.udrawable = drawable;
if (backcolor == null && drawable instanceof TextBlockBackcolored) { if (backcolor == null && drawable instanceof TextBlockBackcolored) {
@ -223,7 +226,6 @@ public class ImageBuilder {
annotations = true; annotations = true;
backcolor = calculateBackColor(diagram); backcolor = calculateBackColor(diagram);
colorMapper = skinParam.getColorMapper(); colorMapper = skinParam.getColorMapper();
dpi = skinParam.getDpi();
handwritten = skinParam.handwritten(); handwritten = skinParam.handwritten();
hoverPathColorRGB = calculateHoverPathColor(skinParam); hoverPathColorRGB = calculateHoverPathColor(skinParam);
lengthAdjust = skinParam.getlengthAdjust(); lengthAdjust = skinParam.getlengthAdjust();
@ -279,7 +281,7 @@ public class ImageBuilder {
dx = -minmax.getMinX(); dx = -minmax.getMinX();
dy = -minmax.getMinY(); dy = -minmax.getMinY();
} }
final double scaleFactor = (scale == null ? 1 : scale.getScale(dim.getWidth(), dim.getHeight())) * dpi / 96.0; final double scaleFactor = (scale == null ? 1 : scale.getScale(dim.getWidth(), dim.getHeight())) * getDpi() / 96.0;
final UGraphic2 ug = createUGraphic(fileFormatOption, dim, animationArg, dx, dy, scaleFactor); final UGraphic2 ug = createUGraphic(fileFormatOption, dim, animationArg, dx, dy, scaleFactor);
UGraphic ug2 = ug; UGraphic ug2 = ug;
maybeDrawBorder(ug, dim); maybeDrawBorder(ug, dim);