octoleo/plantuml
1
0
Fork 0
mirror of https://github.com/octoleo/plantuml.git synced 2024-09-27 14:39:02 +00:00
Code Issues Releases Wiki Activity

Handle Scale & DPI more consistently for all diagram types.

Browse Source
This commit is contained in:
matthew16550 2021-03-19 05:14:42 +11:00
parent 69645c8e1e
commit 2da2146f21
55 changed files with 86 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/sourceforge/plantuml/SourceStringReader.java
View File

@ -229,7 +229,7 @@ public class SourceStringReader {
final TextBlockBackcolored error = GraphicStrings.createForError(Arrays.asList("No @startuml/@enduml found"),
fileFormatOption.isUseRedForError());
HColor backcolor = error.getBackcolor();
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, 1.0, null,
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, null,
null, ClockwiseTopRightBottomLeft.none(), backcolor);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);
imageBuilder.setUDrawable(error);

2
src/net/sourceforge/plantuml/TitledDiagram.java
View File

@ -212,6 +212,8 @@ public abstract class TitledDiagram extends AbstractPSystem implements Diagram,
return useSmetana;
}
@Deprecated
// TODO Well I think it's deprecated - whatever uses it should be looked at closely
public final double getScaleCoef(FileFormatOption fileFormatOption) {
if (getSkinParam().getDpi() == 96) {
return fileFormatOption.getScaleCoef();

2
src/net/sourceforge/plantuml/UmlDiagram.java
View File

@ -185,7 +185,7 @@ public abstract class UmlDiagram extends TitledDiagram implements Diagram, Annot
strings.addAll(CommandExecutionResult.getStackTrace(exception));
HColor backcolor = HColorUtils.WHITE;
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, 1.0, metadata,
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, metadata,
null, ClockwiseTopRightBottomLeft.none(), backcolor);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);

29
src/net/sourceforge/plantuml/activitydiagram3/ActivityDiagram3.java
View File

@ -35,20 +35,16 @@
*/
package net.sourceforge.plantuml.activitydiagram3;
import java.awt.geom.Dimension2D;
import java.io.IOException;
import java.io.OutputStream;
import net.sourceforge.plantuml.AnnotatedWorker;
import net.sourceforge.plantuml.Dimension2DDouble;
import net.sourceforge.plantuml.FileFormatOption;
import net.sourceforge.plantuml.ISkinParam;
import net.sourceforge.plantuml.ISkinSimple;
import net.sourceforge.plantuml.Scale;
import net.sourceforge.plantuml.UmlDiagram;
import net.sourceforge.plantuml.UmlDiagramType;
import net.sourceforge.plantuml.Url;
import net.sourceforge.plantuml.UseStyle;
import net.sourceforge.plantuml.activitydiagram3.ftile.BoxStyle;
import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlanes;
import net.sourceforge.plantuml.command.CommandExecutionResult;
@ -64,7 +60,6 @@ import net.sourceforge.plantuml.graphic.USymbol;
import net.sourceforge.plantuml.graphic.color.Colors;
import net.sourceforge.plantuml.sequencediagram.NotePosition;
import net.sourceforge.plantuml.sequencediagram.NoteType;
import net.sourceforge.plantuml.style.ClockwiseTopRightBottomLeft;
import net.sourceforge.plantuml.ugraphic.ImageBuilder;
import net.sourceforge.plantuml.ugraphic.ImageParameter;
import net.sourceforge.plantuml.ugraphic.color.HColor;
@ -215,18 +210,7 @@ public class ActivityDiagram3 extends UmlDiagram {
final ISkinParam skinParam = getSkinParam();
result = new AnnotatedWorker(this, skinParam, stringBounder).addAdd(result);
final Dimension2D dim = result.getMinMax(stringBounder).getDimension();
final ClockwiseTopRightBottomLeft margins;
if (UseStyle.useBetaStyle()) {
margins = ClockwiseTopRightBottomLeft.marginForDocument(skinParam.getCurrentStyleBuilder());
} else {
margins = ClockwiseTopRightBottomLeft.margin1margin2(10, 10);
}
final double dpiFactor = getDpiFactor(fileFormatOption,
Dimension2DDouble.delta(dim, margins.getLeft() + margins.getRight(), 0));
final ImageParameter imageParameter = new ImageParameter(this, fileFormatOption, dpiFactor);
final ImageParameter imageParameter = new ImageParameter(this, fileFormatOption);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);
imageBuilder.setUDrawable(result);
@ -235,17 +219,6 @@ public class ActivityDiagram3 extends UmlDiagram {
}
private final double getDpiFactor(FileFormatOption fileFormatOption, final Dimension2D dim) {
final double dpiFactor;
final Scale scale = getScale();
if (scale == null) {
dpiFactor = getScaleCoef(fileFormatOption);
} else {
dpiFactor = scale.getScale(dim.getWidth(), dim.getHeight());
}
return dpiFactor;
}
public void fork() {
manageSwimlaneStrategy();
final InstructionFork instructionFork = new InstructionFork(current(), nextLinkRenderer(), getSkinParam(),

5
src/net/sourceforge/plantuml/board/BoardDiagram.java
View File

@ -46,7 +46,6 @@ import net.sourceforge.plantuml.AnnotatedWorker;
import net.sourceforge.plantuml.Dimension2DDouble;
import net.sourceforge.plantuml.FileFormatOption;
import net.sourceforge.plantuml.ISkinParam;
import net.sourceforge.plantuml.Scale;
import net.sourceforge.plantuml.UmlDiagram;
import net.sourceforge.plantuml.UmlDiagramType;
import net.sourceforge.plantuml.command.CommandExecutionResult;
@ -81,12 +80,10 @@ public class BoardDiagram extends UmlDiagram {
@Override
protected ImageData exportDiagramInternal(OutputStream os, int index, FileFormatOption fileFormatOption)
throws IOException {
final Scale scale = getScale();
final double dpiFactor = scale == null ? getScaleCoef(fileFormatOption) : scale.getScale(100, 100);
final ISkinParam skinParam = getSkinParam();
final ImageParameter imageParameter = new ImageParameter(this, fileFormatOption, dpiFactor);
final ImageParameter imageParameter = new ImageParameter(this, fileFormatOption);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);

3
src/net/sourceforge/plantuml/bpm/BpmDiagram.java
View File

@ -81,8 +81,7 @@ public class BpmDiagram extends UmlDiagram {
@Override
protected ImageData exportDiagramInternal(OutputStream os, int index, FileFormatOption fileFormatOption)
throws IOException {
final double dpiFactor = 1;
final ImageParameter imageParameter = new ImageParameter(this, fileFormatOption, dpiFactor);
final ImageParameter imageParameter = new ImageParameter(this, fileFormatOption);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);
imageBuilder.setUDrawable(getUDrawable());

2
src/net/sourceforge/plantuml/braille/UGraphicBraille.java
View File

@ -128,7 +128,7 @@ public class UGraphicBraille extends AbstractUGraphic<BrailleGrid> implements Cl
public void writeImageTOBEMOVED(OutputStream os, String metadata, int dpi) throws IOException {
HColor backcolor = HColorUtils.WHITE;
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, 1.0, metadata,
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, metadata,
null, ClockwiseTopRightBottomLeft.none(), backcolor);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);
imageBuilder.setUDrawable(new BrailleDrawer(getGraphicObject()));

2
src/net/sourceforge/plantuml/classdiagram/ClassDiagram.java
View File

@ -198,7 +198,7 @@ public class ClassDiagram extends AbstractClassOrObjectDiagram {
final RowLayout rawLayout = getRawLayout(i);
fullLayout.addRowLayout(rawLayout);
}
final ImageParameter imageParameter = new ImageParameter(this, fileFormatOption, 1.0);
final ImageParameter imageParameter = new ImageParameter(this, fileFormatOption);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);
imageBuilder.setUDrawable(fullLayout);
return imageBuilder.writeImageTOBEMOVED(seed(), os);

2
src/net/sourceforge/plantuml/creole/legacy/PSystemCreole.java
View File

@ -84,7 +84,7 @@ public class PSystemCreole extends AbstractPSystem {
final Sheet sheet = Parser.build(fontConfiguration, HorizontalAlignment.LEFT,
SkinParam.create(UmlDiagramType.SEQUENCE), CreoleMode.FULL).createSheet(display);
final SheetBlock1 sheetBlock = new SheetBlock1(sheet, LineBreakStrategy.NONE, 0);
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, 1.0, null,
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, null,
null, ClockwiseTopRightBottomLeft.none(), null);
final ImageBuilder builder = ImageBuilder.build(imageParameter);

2
src/net/sourceforge/plantuml/cute/PSystemCute.java
View File

@ -100,7 +100,7 @@ public class PSystemCute extends AbstractPSystem {
margin2 = 10;
}
final ClockwiseTopRightBottomLeft margins = ClockwiseTopRightBottomLeft.margin1margin2(margin1, margin2);
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, 1.0, null,
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, null,
null, margins, null);
final ImageBuilder builder = ImageBuilder.build(imageParameter);
builder.setUDrawable(root);

2
src/net/sourceforge/plantuml/dedication/PSystemDedication.java
View File

@ -69,7 +69,7 @@ public class PSystemDedication extends AbstractPSystem {
final protected ImageData exportDiagramNow(OutputStream os, int num, FileFormatOption fileFormat, long seed)
throws IOException {
HColor backcolor = HColorUtils.WHITE;
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, 1.0,
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null,
getMetadata(), null, ClockwiseTopRightBottomLeft.none(), backcolor);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);
imageBuilder.setUDrawable(new UDrawable() {

2
src/net/sourceforge/plantuml/definition/PSystemDefinition.java
View File

@ -73,7 +73,7 @@ public class PSystemDefinition extends AbstractPSystem implements UDrawable {
@Override
final protected ImageData exportDiagramNow(OutputStream os, int num, FileFormatOption fileFormatOption, long seed)
throws IOException {
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, 1.0, "", "",
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, "", "",
ClockwiseTopRightBottomLeft.none(), null);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);
imageBuilder.setUDrawable(this);

2
src/net/sourceforge/plantuml/donors/PSystemDonors.java
View File

@ -111,7 +111,7 @@ public class PSystemDonors extends AbstractPSystem {
throws IOException {
final UDrawable result = getGraphicStrings();
HColor backcolor = HColorUtils.WHITE;
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, 1.0,
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null,
getMetadata(), null, ClockwiseTopRightBottomLeft.none(), backcolor);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);
imageBuilder.setUDrawable(result);

2
src/net/sourceforge/plantuml/donors/PSystemSkinparameterList.java
View File

@ -66,7 +66,7 @@ public class PSystemSkinparameterList extends AbstractPSystem {
throws IOException {
final UDrawable result = getGraphicStrings();
HColor backcolor = HColorUtils.WHITE;
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, 1.0,
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null,
getMetadata(), null, ClockwiseTopRightBottomLeft.none(), backcolor);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);
imageBuilder.setUDrawable(result);

2
src/net/sourceforge/plantuml/eggs/PSystemAppleTwo.java
View File

@ -72,7 +72,7 @@ public class PSystemAppleTwo extends AbstractPSystem {
throws IOException {
final TextBlockBackcolored result = getGraphicStrings();
HColor backcolor = result.getBackcolor();
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, 1.0,
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null,
getMetadata(), null, ClockwiseTopRightBottomLeft.none(), backcolor);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);
imageBuilder.setUDrawable(result);

2
src/net/sourceforge/plantuml/eggs/PSystemCharlie.java
View File

@ -67,7 +67,7 @@ public class PSystemCharlie extends AbstractPSystem {
final protected ImageData exportDiagramNow(OutputStream os, int num, FileFormatOption fileFormat, long seed)
throws IOException {
HColor backcolor = HColorUtils.BLACK;
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, 1.0,
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null,
getMetadata(), null, ClockwiseTopRightBottomLeft.none(), backcolor);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);
imageBuilder.setUDrawable(new UDrawable() {

2
src/net/sourceforge/plantuml/eggs/PSystemColors.java
View File

@ -93,7 +93,7 @@ public class PSystemColors extends AbstractPSystem implements UDrawable {
final protected ImageData exportDiagramNow(OutputStream os, int num, FileFormatOption fileFormat, long seed)
throws IOException {
HColor backcolor = HColorUtils.WHITE;
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, 1.0,
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null,
getMetadata(), null, ClockwiseTopRightBottomLeft.none(), backcolor);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);
imageBuilder.setUDrawable(this);

2
src/net/sourceforge/plantuml/eggs/PSystemEgg.java
View File

@ -69,7 +69,7 @@ public class PSystemEgg extends AbstractPSystem {
throws IOException {
final TextBlockBackcolored result = getGraphicStrings();
HColor backcolor = result.getBackcolor();
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, 1.0,
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null,
getMetadata(), null, ClockwiseTopRightBottomLeft.none(), backcolor);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);
imageBuilder.setUDrawable(result);

2
src/net/sourceforge/plantuml/eggs/PSystemLost.java
View File

@ -65,7 +65,7 @@ public class PSystemLost extends AbstractPSystem {
throws IOException {
final TextBlockBackcolored result = getGraphicStrings();
HColor backcolor = result.getBackcolor();
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, 1.0,
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null,
getMetadata(), null, ClockwiseTopRightBottomLeft.none(), backcolor);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);
imageBuilder.setUDrawable(result);

2
src/net/sourceforge/plantuml/eggs/PSystemRIP.java
View File

@ -84,7 +84,7 @@ public class PSystemRIP extends AbstractPSystem {
throws IOException {
final TextBlockBackcolored result = getGraphicStrings();
HColor backcolor = result.getBackcolor();
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, 1.0,
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null,
getMetadata(), null, ClockwiseTopRightBottomLeft.none(), backcolor);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);
imageBuilder.setUDrawable(result);

2
src/net/sourceforge/plantuml/eggs/PSystemWelcome.java
View File

@ -89,7 +89,7 @@ public class PSystemWelcome extends AbstractPSystem {
throws IOException {
final TextBlockBackcolored result = getGraphicStrings();
HColor backcolor = result.getBackcolor();
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, 1.0,
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null,
getMetadata(), null, ClockwiseTopRightBottomLeft.none(), backcolor);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);
imageBuilder.setUDrawable(result);

2
src/net/sourceforge/plantuml/error/PSystemError.java
View File

@ -231,7 +231,7 @@ public abstract class PSystemError extends AbstractPSystem {
TextBlock udrawable;
HColor backcolor = result.getBackcolor();
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, 1.0,
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null,
getMetadata(), null, ClockwiseTopRightBottomLeft.none(), backcolor);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);
imageBuilder.setRandomPixel(true);

2
src/net/sourceforge/plantuml/font/PSystemListFonts.java
View File

@ -79,7 +79,7 @@ public class PSystemListFonts extends AbstractPSystem {
throws IOException {
final TextBlockBackcolored result = getGraphicStrings();
HColor backcolor = result.getBackcolor();
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, 1.0,
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null,
getMetadata(), null, ClockwiseTopRightBottomLeft.none(), backcolor);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);
imageBuilder.setUDrawable(result);

6
src/net/sourceforge/plantuml/gitlog/GitDiagram.java
View File

@ -43,7 +43,6 @@ import java.util.Collection;
import net.sourceforge.plantuml.AnnotatedWorker;
import net.sourceforge.plantuml.FileFormatOption;
import net.sourceforge.plantuml.ISkinParam;
import net.sourceforge.plantuml.Scale;
import net.sourceforge.plantuml.SkinParam;
import net.sourceforge.plantuml.UmlDiagram;
import net.sourceforge.plantuml.UmlDiagramType;
@ -80,9 +79,7 @@ public class GitDiagram extends UmlDiagram {
@Override
protected ImageData exportDiagramInternal(OutputStream os, int index, FileFormatOption fileFormatOption)
throws IOException {
final Scale scale = getScale();
final double dpiFactor = scale == null ? 1 : scale.getScale(100, 100);
final ISkinParam skinParam = getSkinParam();
final int margin1;
final int margin2;
@ -93,7 +90,8 @@ public class GitDiagram extends UmlDiagram {
margin1 = 10;
margin2 = 10;
}
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, dpiFactor, "",
// TODO change to other ImageParameter constructor?
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, "",
"", ClockwiseTopRightBottomLeft.margin1margin2(margin1, margin2), null);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);
TextBlock result = getTextBlock();

2
src/net/sourceforge/plantuml/help/Help.java
View File

@ -79,7 +79,7 @@ public class Help extends UmlDiagram {
final Sheet sheet = Parser.build(fontConfiguration, HorizontalAlignment.LEFT, getSkinParam(), CreoleMode.FULL)
.createSheet(display);
final SheetBlock1 sheetBlock = new SheetBlock1(sheet, LineBreakStrategy.NONE, 0);
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, 1.0, null,
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, null,
null, ClockwiseTopRightBottomLeft.none(), null);
final ImageBuilder builder = ImageBuilder.build(imageParameter);

5
src/net/sourceforge/plantuml/jsondiagram/JsonDiagram.java
View File

@ -43,7 +43,6 @@ import java.util.List;
import net.sourceforge.plantuml.AnnotatedWorker;
import net.sourceforge.plantuml.FileFormatOption;
import net.sourceforge.plantuml.ISkinParam;
import net.sourceforge.plantuml.Scale;
import net.sourceforge.plantuml.TitledDiagram;
import net.sourceforge.plantuml.UmlDiagramType;
import net.sourceforge.plantuml.core.DiagramDescription;
@ -91,11 +90,9 @@ public class JsonDiagram extends TitledDiagram {
@Override
protected ImageData exportDiagramNow(OutputStream os, int index, FileFormatOption fileFormatOption, long seed)
throws IOException {
final Scale scale = getScale();
final double dpiFactor = scale == null ? 1 : scale.getScale(100, 100);
final ISkinParam skinParam = getSkinParam();
final ImageParameter imageParameter = new ImageParameter(this, fileFormatOption, dpiFactor);
final ImageParameter imageParameter = new ImageParameter(this, fileFormatOption);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);
TextBlock result = getTextBlock();
result = new AnnotatedWorker(this, skinParam, fileFormatOption.getDefaultStringBounder(getSkinParam()))

2
src/net/sourceforge/plantuml/jungle/PSystemTree.java
View File

@ -83,7 +83,7 @@ public class PSystemTree extends AbstractPSystem {
HColor backcolor = HColorUtils.WHITE;
final ClockwiseTopRightBottomLeft margins = ClockwiseTopRightBottomLeft.margin1margin2(margin1, margin2);
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, 1.0, null,
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, null,
null, margins, backcolor);
final ImageBuilder builder = ImageBuilder.build(imageParameter);

2
src/net/sourceforge/plantuml/math/ScientificEquationSafe.java
View File

@ -138,7 +138,7 @@ public class ScientificEquationSafe {
private ImageBuilder getRollback() {
final TextBlock block = GraphicStrings.createBlackOnWhiteMonospaced(Arrays.asList(formula));
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, 1.0, null,
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, null,
null, ClockwiseTopRightBottomLeft.none(), null);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);
imageBuilder.setUDrawable(block);

6
src/net/sourceforge/plantuml/mindmap/MindMapDiagram.java
View File

@ -44,8 +44,6 @@ import net.sourceforge.plantuml.AnnotatedWorker;
import net.sourceforge.plantuml.Dimension2DDouble;
import net.sourceforge.plantuml.Direction;
import net.sourceforge.plantuml.FileFormatOption;
import net.sourceforge.plantuml.ISkinParam;
import net.sourceforge.plantuml.Scale;
import net.sourceforge.plantuml.UmlDiagram;
import net.sourceforge.plantuml.UmlDiagramType;
import net.sourceforge.plantuml.command.CommandExecutionResult;
@ -87,10 +85,8 @@ public class MindMapDiagram extends UmlDiagram {
@Override
protected ImageData exportDiagramInternal(OutputStream os, int index, FileFormatOption fileFormatOption)
throws IOException {
final Scale scale = getScale();
final double dpiFactor = scale == null ? getScaleCoef(fileFormatOption) : scale.getScale(100, 100);
final ImageParameter imageParameter = new ImageParameter(this, fileFormatOption, dpiFactor);
final ImageParameter imageParameter = new ImageParameter(this, fileFormatOption);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);
TextBlock result = getTextBlock();

5
src/net/sourceforge/plantuml/nwdiag/NwDiagram.java
View File

@ -50,7 +50,6 @@ import net.sourceforge.plantuml.AnnotatedWorker;
import net.sourceforge.plantuml.ColorParam;
import net.sourceforge.plantuml.FileFormatOption;
import net.sourceforge.plantuml.ISkinParam;
import net.sourceforge.plantuml.Scale;
import net.sourceforge.plantuml.SpriteContainerEmpty;
import net.sourceforge.plantuml.UmlDiagram;
import net.sourceforge.plantuml.UmlDiagramType;
@ -217,11 +216,9 @@ public class NwDiagram extends UmlDiagram {
@Override
protected ImageData exportDiagramInternal(OutputStream os, int index, FileFormatOption fileFormatOption)
throws IOException {
final Scale scale = getScale();
final double dpiFactor = scale == null ? 1 : scale.getScale(100, 100);
final ISkinParam skinParam = getSkinParam();
final ImageParameter imageParameter = new ImageParameter(this, fileFormatOption, dpiFactor);
final ImageParameter imageParameter = new ImageParameter(this, fileFormatOption);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);
TextBlock result = getTextBlock();
result = new AnnotatedWorker(this, skinParam, fileFormatOption.getDefaultStringBounder(getSkinParam()))

2
src/net/sourceforge/plantuml/openiconic/PSystemListOpenIconic.java
View File

@ -68,7 +68,7 @@ public class PSystemListOpenIconic extends AbstractPSystem {
final UDrawable result = getGraphicStrings();
HColor backcolor = HColorUtils.WHITE;
final String metadata = fileFormat.isWithMetadata() ? getMetadata() : null;
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, 1.0, metadata,
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, metadata,
null, ClockwiseTopRightBottomLeft.none(), backcolor);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);
imageBuilder.setUDrawable(result);

2
src/net/sourceforge/plantuml/openiconic/PSystemOpenIconic.java
View File

@ -76,7 +76,7 @@ public class PSystemOpenIconic extends AbstractPSystem {
margin2 = 5;
}
final ClockwiseTopRightBottomLeft margins = ClockwiseTopRightBottomLeft.margin1margin2(margin1, margin2);
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, 1.0, null,
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, null,
null, margins, null);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);
imageBuilder.setUDrawable(icon.asTextBlock(HColorUtils.BLACK, factor));

2
src/net/sourceforge/plantuml/oregon/PSystemOregon.java
View File

@ -102,7 +102,7 @@ public class PSystemOregon extends AbstractPSystem {
throws IOException {
final TextBlockBackcolored result = getGraphicStrings();
HColor backcolor = result.getBackcolor();
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, 1.0,
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null,
getMetadata(), null, ClockwiseTopRightBottomLeft.none(), backcolor);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);
imageBuilder.setUDrawable(result);

5
src/net/sourceforge/plantuml/project/GanttDiagram.java
View File

@ -52,7 +52,6 @@ import java.util.regex.Pattern;
import net.sourceforge.plantuml.AnnotatedWorker;
import net.sourceforge.plantuml.Dimension2DDouble;
import net.sourceforge.plantuml.FileFormatOption;
import net.sourceforge.plantuml.Scale;
import net.sourceforge.plantuml.TitledDiagram;
import net.sourceforge.plantuml.UmlDiagramType;
import net.sourceforge.plantuml.WithSprite;
@ -168,9 +167,7 @@ public class GanttDiagram extends TitledDiagram implements ToTaskDraw, WithSprit
@Override
protected ImageData exportDiagramNow(OutputStream os, int index, FileFormatOption fileFormatOption, long seed)
throws IOException {
final Scale scale = getScale();
final double dpiFactor = scale == null ? 1 : scale.getScale(100, 100);
final ImageParameter imageParameter = new ImageParameter(this, fileFormatOption, dpiFactor);
final ImageParameter imageParameter = new ImageParameter(this, fileFormatOption);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);
final StringBounder stringBounder = fileFormatOption.getDefaultStringBounder(getSkinParam());

5
src/net/sourceforge/plantuml/salt/PSystemSalt.java
View File

@ -49,7 +49,6 @@ import net.sourceforge.plantuml.Dimension2DDouble;
import net.sourceforge.plantuml.FileFormatOption;
import net.sourceforge.plantuml.ISkinParam;
import net.sourceforge.plantuml.Log;
import net.sourceforge.plantuml.Scale;
import net.sourceforge.plantuml.ScaleSimple;
import net.sourceforge.plantuml.TitledDiagram;
import net.sourceforge.plantuml.UmlDiagram;
@ -124,10 +123,8 @@ public class PSystemSalt extends TitledDiagram implements WithSprite {
final StringBounder stringBounder = fileFormatOption.getDefaultStringBounder(getSkinParam());
final Dimension2D size = salt.getPreferredDimension(stringBounder, 0, 0);
final Scale scale = getScale();
final double dpiFactor = scale == null ? getScaleCoef(fileFormatOption) : scale.getScale(100, 100);
final ISkinParam skinParam = getSkinParam();
final ImageParameter imageParameter = new ImageParameter(this, fileFormatOption, dpiFactor);
final ImageParameter imageParameter = new ImageParameter(this, fileFormatOption);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);

3
src/net/sourceforge/plantuml/sdot/CucaDiagramFileMakerSmetana.java
View File

@ -442,8 +442,7 @@ public class CucaDiagramFileMakerSmetana implements CucaDiagramFileMaker {
// DebugUtils.printDebugEdge(e);
// }
final double scale = 1;
final ImageParameter imageParameter = new ImageParameter(diagram, fileFormatOption, scale);
final ImageParameter imageParameter = new ImageParameter(diagram, fileFormatOption);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);

13
src/net/sourceforge/plantuml/sequencediagram/SequenceDiagram.java
View File

@ -34,7 +34,6 @@
*/
package net.sourceforge.plantuml.sequencediagram;
import java.awt.geom.Dimension2D;
import java.io.IOException;
import java.io.OutputStream;
import java.text.DecimalFormat;
@ -53,7 +52,6 @@ import net.sourceforge.plantuml.FileFormat;
import net.sourceforge.plantuml.FileFormatOption;
import net.sourceforge.plantuml.ISkinSimple;
import net.sourceforge.plantuml.OptionFlags;
import net.sourceforge.plantuml.Scale;
import net.sourceforge.plantuml.UmlDiagram;
import net.sourceforge.plantuml.UmlDiagramType;
import net.sourceforge.plantuml.command.CommandExecutionResult;
@ -498,17 +496,6 @@ public class SequenceDiagram extends UmlDiagram {
return true;
}
public double getDpiFactor(FileFormatOption fileFormatOption, Dimension2D dim) {
final double dpiFactor;
final Scale scale = getScale();
if (scale == null) {
dpiFactor = getScaleCoef(fileFormatOption);
} else {
dpiFactor = scale.getScale(dim.getWidth(), dim.getHeight());
}
return dpiFactor;
}
@Override
public String checkFinalError() {
if (this.isHideUnlinkedData()) {

38
src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramFileMakerPuma2.java
View File

@ -82,8 +82,6 @@ public class SequenceDiagramFileMakerPuma2 implements FileMaker {
private final FileFormatOption fileFormatOption;
private final StringBounder stringBounder;
private double scale;
public SequenceDiagramFileMakerPuma2(SequenceDiagram diagram, Rose skin, FileFormatOption fileFormatOption) {
this.diagram = diagram;
this.stringBounder = fileFormatOption.getDefaultStringBounder(diagram.getSkinParam());
@ -188,14 +186,7 @@ public class SequenceDiagramFileMakerPuma2 implements FileMaker {
final Dimension2D dimLegend = legendBlock.calculateDimension(stringBounder);
area.setLegend(dimLegend, isLegendTop(), diagram.getLegend().getHorizontalAlignment());
scale = getScale(area.getWidth(), area.getHeight());
final double dpiFactor = diagram.getScaleCoef(fileFormatOption);
// System.err.println("dpiFactor=" + dpiFactor);
// System.err.println("scale=" + scale);
final double factor = oneOf(scale, dpiFactor);
final ImageParameter imageParameter = new ImageParameter(diagram, fileFormatOption, factor);
final ImageParameter imageParameter = new ImageParameter(diagram, fileFormatOption);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);
imageBuilder.setUDrawable(new UDrawable() {
@ -255,33 +246,6 @@ public class SequenceDiagramFileMakerPuma2 implements FileMaker {
new UTranslate(area.getHeaderX(diagram.getHeader().getHorizontalAlignment()), area.getHeaderY())));
}
private double oneOf(double a, double b) {
if (a == 1) {
return b;
}
return a;
}
private double getImageWidth(SequenceDiagramArea area, double dpiFactor, double legendWidth) {
final int minsize = diagram.getMinwidth();
final double w = Math.max(area.getWidth() * getScale(area.getWidth(), area.getHeight()) * dpiFactor,
legendWidth);
if (minsize == Integer.MAX_VALUE) {
return w;
}
if (w >= minsize) {
return w;
}
return minsize;
}
private double getScale(double width, double height) {
if (diagram.getScale() == null) {
return 1;
}
return diagram.getScale().getScale(width, height);
}
private PngTitler getPngTitler(final FontParam fontParam, int page) {
final ISkinParam skinParam = diagram.getSkinParam();
final HColor hyperlinkColor = skinParam.getHyperlinkColor();

14
src/net/sourceforge/plantuml/sequencediagram/teoz/SequenceDiagramFileMakerTeoz.java
View File

@ -135,23 +135,11 @@ public class SequenceDiagramFileMakerTeoz implements FileMaker {
private final double heightEnglober1;
private final double heightEnglober2;
private double oneOf(double a, double b) {
if (a == 1) {
return b;
}
return a;
}
public ImageData createOne(OutputStream os, final int index, boolean isWithMetadata) throws IOException {
if (this.index != index) {
throw new IllegalStateException();
}
final double dpiFactor = diagram.getDpiFactor(fileFormatOption, dimTotal);
final double scale = 1;
final double factor = oneOf(scale, dpiFactor);
final ImageParameter imageParameter = new ImageParameter(diagram, fileFormatOption, factor);
final ImageParameter imageParameter = new ImageParameter(diagram, fileFormatOption);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);

3
src/net/sourceforge/plantuml/sprite/ListSpriteDiagram.java
View File

@ -75,8 +75,7 @@ public class ListSpriteDiagram extends UmlDiagram {
throws IOException {
final TextBlock result = getTable();
final double dpiFactor = 1;
final ImageParameter imageParameter = new ImageParameter(this, fileFormatOption, dpiFactor);
final ImageParameter imageParameter = new ImageParameter(this, fileFormatOption);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);
imageBuilder.setUDrawable(result);

2
src/net/sourceforge/plantuml/sprite/PSystemListInternalSprites.java
View File

@ -63,7 +63,7 @@ public class PSystemListInternalSprites extends AbstractPSystem {
throws IOException {
final UDrawable result = getGraphicStrings();
HColor backcolor = HColorUtils.WHITE;
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, 1.0,
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null,
getMetadata(), null, ClockwiseTopRightBottomLeft.none(), backcolor);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);
imageBuilder.setUDrawable(result);

3
src/net/sourceforge/plantuml/sprite/StdlibDiagram.java
View File

@ -86,8 +86,7 @@ public class StdlibDiagram extends UmlDiagram {
final TextBlock result = getTable();
final double dpiFactor = 1;
final ImageParameter imageParameter = new ImageParameter(this, fileFormatOption, dpiFactor);
final ImageParameter imageParameter = new ImageParameter(this, fileFormatOption);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);
imageBuilder.setUDrawable(result);

2
src/net/sourceforge/plantuml/stats/PSystemStats.java
View File

@ -65,7 +65,7 @@ public class PSystemStats extends AbstractPSystem {
throws IOException {
final TextBlockBackcolored result = getGraphicStrings();
HColor backcolor = result.getBackcolor();
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, 1.0,
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null,
getMetadata(), null, ClockwiseTopRightBottomLeft.none(), backcolor);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);
imageBuilder.setUDrawable(result);

16
src/net/sourceforge/plantuml/svek/CucaDiagramFileMakerSvek.java
View File

@ -45,7 +45,6 @@ import net.sourceforge.plantuml.AnnotatedWorker;
import net.sourceforge.plantuml.BaseFile;
import net.sourceforge.plantuml.FileFormatOption;
import net.sourceforge.plantuml.NamedOutputStream;
import net.sourceforge.plantuml.Scale;
import net.sourceforge.plantuml.UmlDiagramType;
import net.sourceforge.plantuml.api.ImageDataAbstract;
import net.sourceforge.plantuml.core.ImageData;
@ -118,13 +117,11 @@ public final class CucaDiagramFileMakerSvek implements CucaDiagramFileMaker {
if (widthwarning != null && widthwarning.matches("\\d+")) {
warningOrError = svek2.getWarningOrError(Integer.parseInt(widthwarning));
}
final Dimension2D dim = result.calculateDimension(stringBounder);
final double scale = getScale(fileFormatOption, dim);
final HColor backcolor = result.getBackcolor();
final String metadata = fileFormatOption.isWithMetadata() ? diagram.getMetadata() : null;
final ImageParameter imageParameter = new ImageParameter(diagram, fileFormatOption, scale, metadata,
final ImageParameter imageParameter = new ImageParameter(diagram, fileFormatOption, metadata,
warningOrError, backcolor);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);
@ -162,15 +159,4 @@ public final class CucaDiagramFileMakerSvek implements CucaDiagramFileMaker {
result.add(link);
}
private double getScale(FileFormatOption fileFormatOption, final Dimension2D dim) {
final double scale;
final Scale diagScale = diagram.getScale();
if (diagScale == null) {
scale = diagram.getScaleCoef(fileFormatOption);
} else {
scale = diagScale.getScale(dim.getWidth(), dim.getHeight());
}
return scale;
}
}

2
src/net/sourceforge/plantuml/swing/ImageWindow2.java
View File

@ -333,7 +333,7 @@ class ImageWindow2 extends JFrame {
final String msg = "Error reading file: " + ex.toString();
final TextBlockBackcolored error = GraphicStrings.createForError(Arrays.asList(msg), false);
HColor backcolor = error.getBackcolor();
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, 1.0, null,
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, null,
null, ClockwiseTopRightBottomLeft.none(), backcolor);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);
imageBuilder.setUDrawable(error);

3
src/net/sourceforge/plantuml/timingdiagram/TimingDiagram.java
View File

@ -99,8 +99,7 @@ public class TimingDiagram extends UmlDiagram implements Clocks {
@Override
protected ImageData exportDiagramInternal(OutputStream os, int index, FileFormatOption fileFormatOption)
throws IOException {
final double dpiFactor = 1;
final ImageParameter imageParameter = new ImageParameter(this, fileFormatOption, dpiFactor);
final ImageParameter imageParameter = new ImageParameter(this, fileFormatOption);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);
TextBlock result = getTextBlock();

2
src/net/sourceforge/plantuml/ugraphic/FontChecker.java
View File

@ -172,7 +172,7 @@ public class FontChecker {
public BufferedImage getBufferedImage(final char c) throws IOException {
assert c != '\t';
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, 1.0, null,
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, null,
null, ClockwiseTopRightBottomLeft.none(), null);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);
final double dim = 20;

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

@ -170,7 +170,7 @@ public class ImageBuilder {
if (ug instanceof UGraphicG2d) {
final Set<Url> urls = ((UGraphicG2d) ug).getAllUrlsEncountered();
if (urls.size() > 0) {
final CMapData cmap = CMapData.cmapString(urls, param.getDpiFactor());
final CMapData cmap = CMapData.cmapString(urls, param.getDpi());
return new ImageDataComplex(dim, cmap, param.getWarningOrError());
}
}
@ -281,13 +281,15 @@ public class ImageBuilder {
private UGraphic2 createUGraphic(FileFormatOption option, long seed, final Dimension2D dim, Animation animationArg,
double dx, double dy) {
final ColorMapper colorMapper = param.getColorMapper();
final double scaleFactor = (param.getScale() == null ? 1 : param.getScale().getScale(dim.getWidth(), dim.getHeight()))
* param.getDpi() / 96.0;
final FileFormat fileFormat = option.getFileFormat();
switch (fileFormat) {
case PNG:
return createUGraphicPNG(colorMapper, param.getDpiFactor(), dim, param.getBackcolor(), animationArg, dx, dy,
return createUGraphicPNG(colorMapper, scaleFactor, dim, param.getBackcolor(), animationArg, dx, dy,
option.getWatermark());
case SVG:
return createUGraphicSVG(colorMapper, param.getDpiFactor(), dim, param.getBackcolor(),
return createUGraphicSVG(colorMapper, scaleFactor, dim, param.getBackcolor(),
option.getSvgLinkTarget(), option.getHoverColor(), seed, option.getPreserveAspectRatio(),
param.getlengthAdjust());
case EPS:
@ -299,9 +301,9 @@ public class ImageBuilder {
case VDX:
return new UGraphicVdx(colorMapper);
case LATEX:
return new UGraphicTikz(colorMapper, param.getDpiFactor(), true, option.getTikzFontDistortion());
return new UGraphicTikz(colorMapper, scaleFactor, true, option.getTikzFontDistortion());
case LATEX_NO_PREAMBLE:
return new UGraphicTikz(colorMapper, param.getDpiFactor(), false, option.getTikzFontDistortion());
return new UGraphicTikz(colorMapper, scaleFactor, false, option.getTikzFontDistortion());
case BRAILLE_PNG:
return new UGraphicBraille(colorMapper, fileFormat);
case UTXT:
@ -312,7 +314,7 @@ public class ImageBuilder {
}
}
private UGraphic2 createUGraphicSVG(ColorMapper colorMapper, double scale, Dimension2D dim, final HColor suggested,
private UGraphic2 createUGraphicSVG(ColorMapper colorMapper, double scaleFactor, Dimension2D dim, final HColor suggested,
String svgLinkTarget, String hover, long seed, String preserveAspectRatio, LengthAdjust lengthAdjust) {
HColor backColor = HColorUtils.WHITE;
if (suggested instanceof HColorSimple) {
@ -321,22 +323,22 @@ public class ImageBuilder {
final boolean dimensionStyle = param.isSvgDimensionStyle();
final UGraphicSvg ug;
if (suggested instanceof HColorGradient) {
ug = new UGraphicSvg(dimensionStyle, dim, colorMapper, (HColorGradient) suggested, false, scale,
ug = new UGraphicSvg(dimensionStyle, dim, colorMapper, (HColorGradient) suggested, false, scaleFactor,
svgLinkTarget, hover, seed, preserveAspectRatio, param.getSvgCharSizeHack(),
param.getlengthAdjust());
} else if (backColor == null || colorMapper.toColor(backColor).equals(Color.WHITE)) {
ug = new UGraphicSvg(dimensionStyle, dim, colorMapper, false, scale, svgLinkTarget, hover, seed,
ug = new UGraphicSvg(dimensionStyle, dim, colorMapper, false, scaleFactor, svgLinkTarget, hover, seed,
preserveAspectRatio, param.getSvgCharSizeHack(), param.getlengthAdjust());
} else {
final String tmp = colorMapper.toSvg(backColor);
ug = new UGraphicSvg(dimensionStyle, dim, colorMapper, tmp, false, scale, svgLinkTarget, hover, seed,
ug = new UGraphicSvg(dimensionStyle, dim, colorMapper, tmp, false, scaleFactor, svgLinkTarget, hover, seed,
preserveAspectRatio, param.getSvgCharSizeHack(), param.getlengthAdjust());
}
return ug;
}
private UGraphic2 createUGraphicPNG(ColorMapper colorMapper, double dpiFactor, final Dimension2D dim,
private UGraphic2 createUGraphicPNG(ColorMapper colorMapper, double scaleFactor, final Dimension2D dim,
HColor mybackcolor, Animation affineTransforms, double dx, double dy, String watermark) {
Color backColor = Color.WHITE;
if (mybackcolor instanceof HColorSimple) {
@ -345,16 +347,16 @@ public class ImageBuilder {
backColor = null;
}
final EmptyImageBuilder builder = new EmptyImageBuilder(watermark, (int) (dim.getWidth() * dpiFactor),
(int) (dim.getHeight() * dpiFactor), backColor);
final EmptyImageBuilder builder = new EmptyImageBuilder(watermark, (int) (dim.getWidth() * scaleFactor),
(int) (dim.getHeight() * scaleFactor), backColor);
final Graphics2D graphics2D = builder.getGraphics2D();
final UGraphicG2d ug = new UGraphicG2d(colorMapper, graphics2D, dpiFactor,
final UGraphicG2d ug = new UGraphicG2d(colorMapper, graphics2D, scaleFactor,
affineTransforms == null ? null : affineTransforms.getFirst(), dx, dy);
ug.setBufferedImage(builder.getBufferedImage());
final BufferedImage im = ((UGraphicG2d) ug).getBufferedImage();
if (mybackcolor instanceof HColorGradient) {
ug.apply(mybackcolor.bg()).draw(new URectangle(im.getWidth() / dpiFactor, im.getHeight() / dpiFactor));
ug.apply(mybackcolor.bg()).draw(new URectangle(im.getWidth() / scaleFactor, im.getHeight() / scaleFactor));
}
return ug;

26
src/net/sourceforge/plantuml/ugraphic/ImageParameter.java
View File

@ -40,9 +40,9 @@ import net.sourceforge.plantuml.CornerParam;
import net.sourceforge.plantuml.FileFormatOption;
import net.sourceforge.plantuml.ISkinParam;
import net.sourceforge.plantuml.LineParam;
import net.sourceforge.plantuml.Scale;
import net.sourceforge.plantuml.SvgCharSizeHack;
import net.sourceforge.plantuml.TitledDiagram;
import net.sourceforge.plantuml.UmlDiagram;
import net.sourceforge.plantuml.UseStyle;
import net.sourceforge.plantuml.anim.Animation;
import net.sourceforge.plantuml.skin.rose.Rose;
@ -61,7 +61,8 @@ public class ImageParameter {
private final ColorMapper colorMapper;
private final boolean useHandwritten;
private final Animation animation;
private final double dpiFactor;
private final Scale scale;
private int dpi;
private final String metadata;
private final String warningOrError;
private final ClockwiseTopRightBottomLeft margins;
@ -75,12 +76,13 @@ public class ImageParameter {
private final double borderCorner;
private final FileFormatOption fileFormatOption;
public ImageParameter(ColorMapper colorMapper, boolean useHandwritten, Animation animation, double dpiFactor,
public ImageParameter(ColorMapper colorMapper, boolean useHandwritten, Animation animation,
String metadata, String warningOrError, ClockwiseTopRightBottomLeft margins, HColor backcolor) {
this.colorMapper = colorMapper;
this.useHandwritten = useHandwritten;
this.animation = animation;
this.dpiFactor = dpiFactor;
this.scale = null;
this.dpi = 96;
this.metadata = metadata;
this.warningOrError = warningOrError;
this.margins = margins;
@ -95,11 +97,10 @@ public class ImageParameter {
this.fileFormatOption = null;
}
public ImageParameter(TitledDiagram diagram, FileFormatOption fileFormatOption, double dpiFactor) {
public ImageParameter(TitledDiagram diagram, FileFormatOption fileFormatOption) {
this(
diagram,
fileFormatOption,
dpiFactor,
fileFormatOption.isWithMetadata() ? diagram.getMetadata() : null,
diagram.getWarningOrError(),
getBackgroundColor(diagram)
@ -123,14 +124,15 @@ public class ImageParameter {
return diagram.getSkinParam().getBackgroundColor(false);
}
public ImageParameter(TitledDiagram diagram, FileFormatOption fileFormatOption, double dpiFactor, String metadata,
public ImageParameter(TitledDiagram diagram, FileFormatOption fileFormatOption, String metadata,
String warningOrError, HColor backcolor) {
final ISkinParam skinParam = diagram.getSkinParam();
this.fileFormatOption = fileFormatOption;
this.colorMapper = skinParam.getColorMapper();
this.useHandwritten = skinParam.handwritten();
this.animation = diagram.getAnimation();
this.dpiFactor = dpiFactor;
this.scale = diagram.getScale();
this.dpi = skinParam.getDpi();
this.metadata = metadata;
this.warningOrError = warningOrError;
this.margins = calculateDiagramMargin(diagram);
@ -164,8 +166,12 @@ public class ImageParameter {
return animation;
}
public final double getDpiFactor() {
return dpiFactor;
public Scale getScale() {
return scale;
}
public int getDpi() {
return dpi;
}
public final String getMetadata() {

2
src/net/sourceforge/plantuml/version/PSystemKeycheck.java
View File

@ -79,7 +79,7 @@ public class PSystemKeycheck extends AbstractPSystem {
final protected ImageData exportDiagramNow(OutputStream os, int num, FileFormatOption fileFormat, long seed)
throws IOException {
HColor backcolor = HColorUtils.WHITE;
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, 1.0,
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null,
getMetadata(), null, ClockwiseTopRightBottomLeft.none(), backcolor);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);

2
src/net/sourceforge/plantuml/version/PSystemKeygen.java
View File

@ -77,7 +77,7 @@ public class PSystemKeygen extends AbstractPSystem {
final protected ImageData exportDiagramNow(OutputStream os, int num, FileFormatOption fileFormat, long seed)
throws IOException {
HColor backcolor = HColorUtils.WHITE;
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, 1.0,
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null,
getMetadata(), null, ClockwiseTopRightBottomLeft.none(), backcolor);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);

2
src/net/sourceforge/plantuml/version/PSystemLicense.java
View File

@ -62,7 +62,7 @@ public class PSystemLicense extends AbstractPSystem implements UDrawable {
@Override
final protected ImageData exportDiagramNow(OutputStream os, int num, FileFormatOption fileFormat, long seed)
throws IOException {
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, 1.0,
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null,
getMetadata(), null, ClockwiseTopRightBottomLeft.none(), null);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);
imageBuilder.setUDrawable(this);

2
src/net/sourceforge/plantuml/version/PSystemVersion.java
View File

@ -173,7 +173,7 @@ public class PSystemVersion extends AbstractPSystem {
final TextBlockBackcolored result = GraphicStrings.createBlackOnWhite(strings, image,
GraphicPosition.BACKGROUND_CORNER_BOTTOM_RIGHT);
HColor backcolor = result.getBackcolor();
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null, 1.0,
final ImageParameter imageParameter = new ImageParameter(new ColorMapperIdentity(), false, null,
getMetadata(), null, ClockwiseTopRightBottomLeft.none(), backcolor);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);
imageBuilder.setUDrawable(result);

5
src/net/sourceforge/plantuml/wbs/WBSDiagram.java
View File

@ -44,7 +44,6 @@ import net.sourceforge.plantuml.AnnotatedWorker;
import net.sourceforge.plantuml.Direction;
import net.sourceforge.plantuml.FileFormatOption;
import net.sourceforge.plantuml.ISkinParam;
import net.sourceforge.plantuml.Scale;
import net.sourceforge.plantuml.UmlDiagram;
import net.sourceforge.plantuml.UmlDiagramType;
import net.sourceforge.plantuml.command.CommandExecutionResult;
@ -79,11 +78,9 @@ public class WBSDiagram extends UmlDiagram {
@Override
protected ImageData exportDiagramInternal(OutputStream os, int index, FileFormatOption fileFormatOption)
throws IOException {
final Scale scale = getScale();
final double dpiFactor = scale == null ? getScaleCoef(fileFormatOption) : scale.getScale(100, 100);
final ISkinParam skinParam = getSkinParam();
final ImageParameter imageParameter = new ImageParameter(this, fileFormatOption, dpiFactor);
final ImageParameter imageParameter = new ImageParameter(this, fileFormatOption);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);
TextBlock result = getTextBlock();

5
src/net/sourceforge/plantuml/wire/WireDiagram.java
View File

@ -46,7 +46,6 @@ import net.sourceforge.plantuml.AnnotatedWorker;
import net.sourceforge.plantuml.FileFormat;
import net.sourceforge.plantuml.FileFormatOption;
import net.sourceforge.plantuml.ISkinParam;
import net.sourceforge.plantuml.Scale;
import net.sourceforge.plantuml.TikzFontDistortion;
import net.sourceforge.plantuml.UmlDiagram;
import net.sourceforge.plantuml.UmlDiagramType;
@ -83,11 +82,9 @@ public class WireDiagram extends UmlDiagram {
@Override
protected ImageData exportDiagramInternal(OutputStream os, int index, FileFormatOption fileFormatOption)
throws IOException {
final Scale scale = getScale();
final double dpiFactor = scale == null ? getScaleCoef(fileFormatOption) : scale.getScale(100, 100);
final ISkinParam skinParam = getSkinParam();
final ImageParameter imageParameter = new ImageParameter(this, fileFormatOption, dpiFactor);
final ImageParameter imageParameter = new ImageParameter(this, fileFormatOption);
final ImageBuilder imageBuilder = ImageBuilder.build(imageParameter);
TextBlock result = getTextBlock();