SmartArt: соответствие ECMA-376 (формулы/переменные геометрии, цвета и трансформации, flipH/flipV, dsp:grpSp)
PR checks / web (pull_request) Successful in 38s
PR checks / java (pull_request) Successful in 1m26s
Main: tests, deploy, autotests / web (push) Successful in 43s
Main: tests, deploy, autotests / java (push) Successful in 55s
Main: tests, deploy, autotests / images-web (push) Successful in 31s
Main: tests, deploy, autotests / images-app (push) Successful in 2m10s
Main: tests, deploy, autotests / deploy (push) Successful in 2m19s
Main: tests, deploy, autotests / autotests (push) Successful in 52s
Main: tests, deploy, autotests / rollback (push) Has been skipped
PR checks / web (pull_request) Successful in 38s
PR checks / java (pull_request) Successful in 1m26s
Main: tests, deploy, autotests / web (push) Successful in 43s
Main: tests, deploy, autotests / java (push) Successful in 55s
Main: tests, deploy, autotests / images-web (push) Successful in 31s
Main: tests, deploy, autotests / images-app (push) Successful in 2m10s
Main: tests, deploy, autotests / deploy (push) Successful in 2m19s
Main: tests, deploy, autotests / autotests (push) Successful in 52s
Main: tests, deploy, autotests / rollback (push) Has been skipped
This commit was merged in pull request #44.
This commit is contained in:
+169
-10
@@ -2,6 +2,7 @@ package ru.pjandro.wordpdf.internal.chart;
|
||||
|
||||
import jakarta.xml.bind.JAXBElement;
|
||||
import org.docx4j.dml.BaseStyles;
|
||||
import org.docx4j.dml.CTAngle;
|
||||
import org.docx4j.dml.CTColor;
|
||||
import org.docx4j.dml.CTColorScheme;
|
||||
import org.docx4j.dml.CTFixedPercentage;
|
||||
@@ -12,12 +13,14 @@ import org.docx4j.dml.CTPercentage;
|
||||
import org.docx4j.dml.CTPositiveFixedAngle;
|
||||
import org.docx4j.dml.CTPositiveFixedPercentage;
|
||||
import org.docx4j.dml.CTPositivePercentage;
|
||||
import org.docx4j.dml.CTPresetColor;
|
||||
import org.docx4j.dml.CTScRgbColor;
|
||||
import org.docx4j.dml.CTSchemeColor;
|
||||
import org.docx4j.dml.CTSRgbColor;
|
||||
import org.docx4j.dml.CTSolidColorFillProperties;
|
||||
import org.docx4j.dml.CTSystemColor;
|
||||
import org.docx4j.dml.FontCollection;
|
||||
import org.docx4j.dml.STPresetColorVal;
|
||||
import org.docx4j.dml.STSchemeColorVal;
|
||||
import org.docx4j.dml.TextFont;
|
||||
import org.docx4j.dml.Theme;
|
||||
@@ -33,9 +36,12 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
/**
|
||||
* Палитра DrawingML: тема/дефолтная Office-палитра, базовые цвета
|
||||
* (srgb/scrgb/hsl/sys/scheme) и цепочки трансформаций (lumMod/lumOff/
|
||||
* satMod/satOff/hueMod/hueOff/tint/shade/alpha) со всеми классами
|
||||
* процентных значений; неизвестная трансформация пропускается.
|
||||
* (srgb/scrgb/hsl/sys/scheme/prst — sysClr с lastClr по §20.1.10.58,
|
||||
* таблица ST_PresetColorVal) и полный набор трансформаций
|
||||
* EG_ColorTransform (lumMod/lumOff/tint/shade/lum, satMod/satOff/sat,
|
||||
* hueMod/hueOff/hue, alpha/alphaMod/alphaOff, red/green/blue + Mod/Off,
|
||||
* comp, inv, gray, gamma/invGamma) со всеми классами процентных
|
||||
* значений; неизвестная трансформация пропускается.
|
||||
*/
|
||||
class DrawMlColorTest {
|
||||
|
||||
@@ -143,13 +149,7 @@ class DrawMlColorTest {
|
||||
@Test
|
||||
void baseColorKindsResolved() {
|
||||
DrawMlColor colors = new DrawMlColor(null);
|
||||
CTColor scrgb = new CTColor();
|
||||
CTScRgbColor s = new CTScRgbColor();
|
||||
s.setR(1);
|
||||
s.setG(0);
|
||||
s.setB(0);
|
||||
scrgb.setScrgbClr(s);
|
||||
assertEquals(Color.RED, colors.resolve(scrgb));
|
||||
assertEquals(Color.RED, colors.resolve(scrgb(100000, 0, 0)));
|
||||
CTColor hsl = new CTColor();
|
||||
CTHslColor h = new CTHslColor();
|
||||
h.setHue(0);
|
||||
@@ -242,4 +242,163 @@ class DrawMlColorTest {
|
||||
assertEquals(128, c.getAlpha());
|
||||
assertEquals(Color.BLUE.getRGB() & 0xFFFFFF, c.getRGB() & 0xFFFFFF);
|
||||
}
|
||||
|
||||
private static CTColor scrgb(int r, int g, int b) {
|
||||
CTColor c = new CTColor();
|
||||
CTScRgbColor s = new CTScRgbColor();
|
||||
s.setR(r);
|
||||
s.setG(g);
|
||||
s.setB(b);
|
||||
c.setScrgbClr(s);
|
||||
return c;
|
||||
}
|
||||
|
||||
private static CTColor prst(String name) {
|
||||
CTColor c = new CTColor();
|
||||
CTPresetColor p = new CTPresetColor();
|
||||
p.setVal(STPresetColorVal.fromValue(name));
|
||||
c.setPrstClr(p);
|
||||
return c;
|
||||
}
|
||||
|
||||
private static CTColor srgbWith(String kind, Object value) {
|
||||
CTColor c = srgb("00FF00");
|
||||
srgbWith(c, kind, value);
|
||||
return c;
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private static void srgbWith(CTColor c, String kind, Object value) {
|
||||
c.getSrgbClr().getEGColorTransform().add(
|
||||
new JAXBElement<>(new QName(DML_NS, kind), (Class<Object>) value.getClass(), value));
|
||||
}
|
||||
|
||||
/** §20.1.2.3.30: каналы scrgbClr — проценты линейной гаммы, 50% -> BC (пример спеки). */
|
||||
@Test
|
||||
void scrgbPercentUsesSrgbTransfer() {
|
||||
DrawMlColor colors = new DrawMlColor(null);
|
||||
assertEquals(new Color(0xBC, 0xBC, 0xBC), colors.resolve(scrgb(50000, 50000, 50000)));
|
||||
}
|
||||
|
||||
/** §20.1.2.3.33, §20.1.10.58: без системных цветов используется lastClr. */
|
||||
@Test
|
||||
void sysClrPrefersLastClr() {
|
||||
DrawMlColor colors = new DrawMlColor(null);
|
||||
CTColor c = new CTColor();
|
||||
CTSystemColor s = new CTSystemColor();
|
||||
s.setVal("windowText");
|
||||
s.setLastClr(new byte[] {0x1A, 0x2B, 0x3C});
|
||||
c.setSysClr(s);
|
||||
assertEquals(new Color(0x1A, 0x2B, 0x3C), colors.resolve(c));
|
||||
}
|
||||
|
||||
/** §20.1.10.54: bg2/tx2 — псевдонимы lt2/dk2 (как bg1/tx1 для lt1/dk1). */
|
||||
@Test
|
||||
void schemeBg2Tx2Aliases() {
|
||||
DrawMlColor colors = new DrawMlColor(null);
|
||||
assertEquals(new Color(0xE7, 0xE6, 0xE6), colors.schemeColor("bg2"));
|
||||
assertEquals(colors.schemeColor("lt2"), colors.schemeColor("bg2"));
|
||||
assertEquals(new Color(0x44, 0x54, 0x6A), colors.schemeColor("tx2"));
|
||||
assertEquals(colors.schemeColor("dk2"), colors.schemeColor("tx2"));
|
||||
}
|
||||
|
||||
/** tint/shade — модуляция светлоты HSL (MS-OI29500 §17.3.2.6(a)), не RGB-микс. */
|
||||
@Test
|
||||
void tintShadeModulateHslLuminance() {
|
||||
DrawMlColor colors = new DrawMlColor(null);
|
||||
CTColor tinted = srgb("00FF00");
|
||||
tinted.getSrgbClr().getEGColorTransform()
|
||||
.add(transform("tint", CTPositiveFixedPercentage.class, fixedPct(50000)));
|
||||
assertEquals(new Color(128, 255, 128), colors.resolve(tinted));
|
||||
CTColor shaded = srgb("00FF00");
|
||||
shaded.getSrgbClr().getEGColorTransform()
|
||||
.add(transform("shade", CTPositiveFixedPercentage.class, fixedPct(50000)));
|
||||
assertEquals(new Color(0, 128, 0), colors.resolve(shaded));
|
||||
}
|
||||
|
||||
/** §20.1.2.3.9: элемент трансформации — a:gray (не grayscl), luma 0.299/0.587/0.114. */
|
||||
@Test
|
||||
void grayTransformAppliesLuma() {
|
||||
DrawMlColor colors = new DrawMlColor(null);
|
||||
CTColor c = srgb("FF0000");
|
||||
c.getSrgbClr().getEGColorTransform().add(transform("gray", String.class, ""));
|
||||
assertEquals(new Color(76, 76, 76), colors.resolve(c));
|
||||
}
|
||||
|
||||
/** §20.1.2.3.2: alphaMod масштабирует альфу. */
|
||||
@Test
|
||||
void alphaModScalesOpacity() {
|
||||
DrawMlColor colors = new DrawMlColor(null);
|
||||
Color resolved = colors.resolve(srgbWith("alphaMod", fixedPct(50000)));
|
||||
assertEquals(128, resolved.getAlpha());
|
||||
}
|
||||
|
||||
/** §20.1.2.3.7/.17: comp — max+min−канал, inv — инверсия каналов. */
|
||||
@Test
|
||||
void compAndInvInvertChannels() {
|
||||
DrawMlColor colors = new DrawMlColor(null);
|
||||
CTColor comp = srgb("FF0000");
|
||||
comp.getSrgbClr().getEGColorTransform().add(transform("comp", String.class, ""));
|
||||
assertEquals(new Color(0, 255, 255), colors.resolve(comp));
|
||||
CTColor inv = srgb("0A141E");
|
||||
inv.getSrgbClr().getEGColorTransform().add(transform("inv", String.class, ""));
|
||||
assertEquals(new Color(0xF5, 0xEB, 0xE1), colors.resolve(inv));
|
||||
}
|
||||
|
||||
/** §20.1.2.3.14/.26/.19: абсолютные hue/sat/lum задают компоненту HSL. */
|
||||
@Test
|
||||
void absoluteHueSatLumSetters() {
|
||||
DrawMlColor colors = new DrawMlColor(null);
|
||||
CTAngle hue = new CTAngle();
|
||||
hue.setVal(14400000);
|
||||
assertEquals(Color.BLUE, colors.resolve(srgbWith("hue", hue)));
|
||||
// спека для sat 50% даёт 40C040 (floor), у нас округление — 191
|
||||
assertEquals(new Color(64, 191, 64), colors.resolve(srgbWith("sat", fixed(50000))));
|
||||
assertEquals(new Color(0, 102, 0), colors.resolve(srgbWith("lum", fixed(20000))));
|
||||
}
|
||||
|
||||
/** §20.1.2.3.23-25/.10-12/.4-6: red/green/blue и их Mod/Off. */
|
||||
@Test
|
||||
void channelSettersModsOffsets() {
|
||||
DrawMlColor colors = new DrawMlColor(null);
|
||||
assertEquals(new Color(0, 255, 255), colors.resolve(srgbWith("blue", fixed(100000))));
|
||||
CTColor blueMod = srgb("0000FF");
|
||||
srgbWith(blueMod, "blueMod", fixed(50000));
|
||||
assertEquals(new Color(0, 0, 128), colors.resolve(blueMod));
|
||||
CTColor redOff = srgb("FF0000");
|
||||
srgbWith(redOff, "redOff", fixed(-20000));
|
||||
assertEquals(new Color(204, 0, 0), colors.resolve(redOff));
|
||||
CTColor greenMod = srgb("008000");
|
||||
srgbWith(greenMod, "greenMod", fixed(200000));
|
||||
assertEquals(new Color(0, 255, 0), colors.resolve(greenMod));
|
||||
}
|
||||
|
||||
/** §20.1.2.3.8/.18: gamma/invGamma — sRGB-передаточная функция на канале. */
|
||||
@Test
|
||||
void gammaAndInvGammaApplySrgbTransfer() {
|
||||
DrawMlColor colors = new DrawMlColor(null);
|
||||
CTColor gamma = srgb("808080");
|
||||
gamma.getSrgbClr().getEGColorTransform().add(transform("gamma", String.class, ""));
|
||||
assertEquals(new Color(55, 55, 55), colors.resolve(gamma));
|
||||
CTColor invGamma = srgb("808080");
|
||||
invGamma.getSrgbClr().getEGColorTransform().add(transform("invGamma", String.class, ""));
|
||||
assertEquals(new Color(188, 188, 188), colors.resolve(invGamma));
|
||||
}
|
||||
|
||||
/** §20.1.2.3.22, §20.1.10.48: prstClr из таблицы 190 имён + трансформации у prstClr. */
|
||||
@Test
|
||||
void prstClrResolvedWithTransforms() {
|
||||
DrawMlColor colors = new DrawMlColor(null);
|
||||
assertEquals(new Color(240, 248, 255), colors.resolve(prst("aliceBlue")));
|
||||
CTColor black = prst("black");
|
||||
black.getPrstClr().getEGColorTransform()
|
||||
.add(transform("alpha", CTPercentage.class, pct(50000)));
|
||||
assertEquals(new Color(0, 0, 0, 128), colors.resolve(black));
|
||||
assertEquals(190, DrawMlColor.PRESET_COLORS.size());
|
||||
// строки, потерянные при вёрстке таблицы в PDF/MD (сверены с XSD и PDF)
|
||||
assertEquals(new Color(250, 250, 210), DrawMlColor.PRESET_COLORS.get("lightGoldenrodYellow"));
|
||||
assertEquals(new Color(250, 250, 120), DrawMlColor.PRESET_COLORS.get("ltGoldenrodYellow"));
|
||||
assertEquals(new Color(102, 205, 170), DrawMlColor.PRESET_COLORS.get("mediumAquamarine"));
|
||||
assertEquals(new Color(0, 250, 154), DrawMlColor.PRESET_COLORS.get("mediumSpringGreen"));
|
||||
}
|
||||
}
|
||||
|
||||
+49
-8
@@ -273,21 +273,62 @@ class PresetGeometryTest {
|
||||
assertEquals(4, segments);
|
||||
}
|
||||
|
||||
/** Арифметика префиксных формул (+, -, *, /), голый литерал, пустая/битая fmla → 0. */
|
||||
/** Арифметика префиксных формул (§20.1.9.11), голый литерал, пустая/битая fmla → 0. */
|
||||
@Test
|
||||
void adjustValuesEvaluatesFormulasAndBlanks() {
|
||||
CTPresetGeometry2D geom = new CTPresetGeometry2D();
|
||||
CTGeomGuideList av = new CTGeomGuideList();
|
||||
av.getGd().add(guide("adj1", "45000"));
|
||||
av.getGd().add(guide("adj2", "+ 1 2"));
|
||||
av.getGd().add(guide("adj3", "- 5 2"));
|
||||
av.getGd().add(guide("adj4", "* 2 3 4"));
|
||||
av.getGd().add(guide("adj5", "/ 2 4 6"));
|
||||
av.getGd().add(guide("adj2", "val 45000"));
|
||||
av.getGd().add(guide("adj3", "+- 5 2 1"));
|
||||
av.getGd().add(guide("adj4", "*/ 2 3 4"));
|
||||
av.getGd().add(guide("adj5", "+/ 2 4 6"));
|
||||
av.getGd().add(guide("adj6", null));
|
||||
av.getGd().add(guide("adj7", "+ 1"));
|
||||
av.getGd().add(guide("adj7", "+- 1"));
|
||||
geom.setAvLst(av);
|
||||
assertArrayEquals(new int[]{45000, 3, 3, 1, 1, 0, 0},
|
||||
assertArrayEquals(new int[]{45000, 45000, 6, 1, 1, 0, 0},
|
||||
PresetGeometry.adjustValues(geom),
|
||||
"* = a*b/c, / = (a+b)/c; пустая и оборванная формула — 0");
|
||||
"*/ = a*b/c, +/ = (a+b)/c; пустая и оборванная формула — 0");
|
||||
}
|
||||
|
||||
/** Формула tan (§20.1.9.11): "tan x y" = x·tan(y), y — в 1/60000 градуса. */
|
||||
@Test
|
||||
void tanOperatorComputes() {
|
||||
CTPresetGeometry2D geom = new CTPresetGeometry2D();
|
||||
CTGeomGuideList av = new CTGeomGuideList();
|
||||
av.getGd().add(guide("adj1", "tan 10000 1800000"));
|
||||
geom.setAvLst(av);
|
||||
assertArrayEquals(new int[]{5773}, PresetGeometry.adjustValues(geom),
|
||||
"10000·tan(30°) = 5773,50…");
|
||||
}
|
||||
|
||||
/** Голые "+"/"-"/"*"/"/" — не формулы ECMA (§20.1.9.11 определяет ровно 17); битая fmla → 0. */
|
||||
@Test
|
||||
void bareOperatorFallsBackToZero() {
|
||||
CTPresetGeometry2D geom = new CTPresetGeometry2D();
|
||||
CTGeomGuideList av = new CTGeomGuideList();
|
||||
av.getGd().add(guide("adj1", "+ 1 2"));
|
||||
av.getGd().add(guide("adj2", "- 5 2"));
|
||||
av.getGd().add(guide("adj3", "* 2 3 4"));
|
||||
av.getGd().add(guide("adj4", "/ 2 4 6"));
|
||||
geom.setAvLst(av);
|
||||
assertArrayEquals(new int[]{0, 0, 0, 0}, PresetGeometry.adjustValues(geom),
|
||||
"неизвестный токен — деградация к 0, а не молчаливо неверное значение");
|
||||
}
|
||||
|
||||
/** §20.1.10.56: окружение гайдов содержит все 36 предопределённых переменных. */
|
||||
@Test
|
||||
void intrinsicVariablesComplete() {
|
||||
Map<String, Double> env = PresetGeometry.baseEnv(120.0, 60.0);
|
||||
assertEquals(36, env.size());
|
||||
assertEquals(120.0, env.get("ls"), EPS);
|
||||
assertEquals(60.0, env.get("ss"), EPS);
|
||||
assertEquals(7.5, env.get("ssd8"), EPS);
|
||||
assertEquals(12.0, env.get("wd10"), EPS);
|
||||
assertEquals(12.0, env.get("hd5"), EPS);
|
||||
assertEquals(2700000.0, env.get("cd8"), EPS);
|
||||
assertEquals(8100000.0, env.get("3cd8"), EPS);
|
||||
assertEquals(13500000.0, env.get("5cd8"), EPS);
|
||||
assertEquals(18900000.0, env.get("7cd8"), EPS);
|
||||
}
|
||||
}
|
||||
|
||||
+223
@@ -0,0 +1,223 @@
|
||||
package ru.pjandro.wordpdf.internal.chart;
|
||||
|
||||
import org.docx4j.dml.CTGroupShapeProperties;
|
||||
import org.docx4j.dml.CTGroupTransform2D;
|
||||
import org.docx4j.dml.CTNoFillProperties;
|
||||
import org.docx4j.dml.CTPoint2D;
|
||||
import org.docx4j.dml.CTPositiveSize2D;
|
||||
import org.docx4j.dml.CTPresetGeometry2D;
|
||||
import org.docx4j.dml.CTSRgbColor;
|
||||
import org.docx4j.dml.CTShapeProperties;
|
||||
import org.docx4j.dml.CTSolidColorFillProperties;
|
||||
import org.docx4j.dml.CTTransform2D;
|
||||
import org.docx4j.dml.STShapeType;
|
||||
import org.docx4j.dml.diagram2008.CTDrawing;
|
||||
import org.docx4j.dml.diagram2008.CTGroupShape;
|
||||
import org.docx4j.dml.diagram2008.CTShape;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.awt.image.BufferedImage;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
/**
|
||||
* Обход dsp:spTree и трансформации фигур: flipH/flipV применяются до
|
||||
* rotation и оба о центр bbox (ECMA-376 §20.1.7.6, Annex L.4.7.3),
|
||||
* вложенные dsp:grpSp маппят child-space через CT_GroupTransform2D
|
||||
* (MS-ODRAWXML, Annex L.4.7.4). Фигуры собираются программно — в
|
||||
* закоммиченных фикстурах flip и grpSp нет.
|
||||
*/
|
||||
class SmartArtRendererTest {
|
||||
|
||||
private static final int SIDE_PT = 100;
|
||||
/** Порог «инверсия заливки» в дельте альфы (AA-края дают меньший разброс). */
|
||||
private static final int AA_INVERSION_ALPHA = 128;
|
||||
/** Порог «пиксель отличается» в дельте альфы. */
|
||||
private static final int AA_EDGE_ALPHA = 16;
|
||||
|
||||
private static CTPoint2D point(long x, long y) {
|
||||
CTPoint2D p = new CTPoint2D();
|
||||
p.setX(x);
|
||||
p.setY(y);
|
||||
return p;
|
||||
}
|
||||
|
||||
private static CTPositiveSize2D size(long cx, long cy) {
|
||||
CTPositiveSize2D s = new CTPositiveSize2D();
|
||||
s.setCx(cx);
|
||||
s.setCy(cy);
|
||||
return s;
|
||||
}
|
||||
|
||||
/** Фигура rect/noFill или rect с solidFill FF0000 в child-координатах (EMU). */
|
||||
private static CTShape rect(long offX, long offY, long cx, long cy, boolean red) {
|
||||
CTShape sp = new CTShape();
|
||||
CTShapeProperties spPr = new CTShapeProperties();
|
||||
CTTransform2D t = new CTTransform2D();
|
||||
t.setOff(point(offX, offY));
|
||||
t.setExt(size(cx, cy));
|
||||
spPr.setXfrm(t);
|
||||
CTPresetGeometry2D pg = new CTPresetGeometry2D();
|
||||
pg.setPrst(STShapeType.RECT);
|
||||
spPr.setPrstGeom(pg);
|
||||
if (red) {
|
||||
CTSolidColorFillProperties fill = new CTSolidColorFillProperties();
|
||||
CTSRgbColor c = new CTSRgbColor();
|
||||
c.setVal("FF0000");
|
||||
fill.setSrgbClr(c);
|
||||
spPr.setSolidFill(fill);
|
||||
} else {
|
||||
spPr.setNoFill(new CTNoFillProperties());
|
||||
}
|
||||
sp.setSpPr(spPr);
|
||||
return sp;
|
||||
}
|
||||
|
||||
private static CTDrawing tree(Object... spOrGrpSp) {
|
||||
CTDrawing d = new CTDrawing();
|
||||
CTGroupShape root = new CTGroupShape();
|
||||
for (Object o : spOrGrpSp) {
|
||||
root.getSpOrGrpSp().add(o);
|
||||
}
|
||||
d.setSpTree(root);
|
||||
return d;
|
||||
}
|
||||
|
||||
private static BufferedImage render(CTDrawing d) {
|
||||
return SmartArtRenderer.render(d, null, new DrawMlColor(null), SIDE_PT, SIDE_PT);
|
||||
}
|
||||
|
||||
private static boolean reddish(BufferedImage img, double fx, double fy) {
|
||||
int argb = img.getRGB((int) (fx * img.getWidth()), (int) (fy * img.getHeight()));
|
||||
int a = (argb >>> 24) & 0xFF;
|
||||
int r = (argb >> 16) & 0xFF;
|
||||
int g = argb & 0xFF;
|
||||
int b = (argb >> 8) & 0xFF;
|
||||
return a > 128 && r > 200 && g < 80 && b < 80;
|
||||
}
|
||||
|
||||
private static boolean transparent(BufferedImage img, double fx, double fy) {
|
||||
int argb = img.getRGB((int) (fx * img.getWidth()), (int) (fy * img.getHeight()));
|
||||
return ((argb >>> 24) & 0xFF) == 0;
|
||||
}
|
||||
|
||||
/** §20.1.7.6 / Annex L.4.7.3: flipH — зеркало геометрии относительно центра bbox. */
|
||||
@Test
|
||||
void flipHMirrorsGeometry() {
|
||||
assertMirror(render(tree(circularArrow(false, false))),
|
||||
render(tree(circularArrow(true, false))), true);
|
||||
}
|
||||
|
||||
/** §20.1.7.6 / Annex L.4.7.3: flipV — вертикальное зеркало. */
|
||||
@Test
|
||||
void flipVMirrorsGeometry() {
|
||||
assertMirror(render(tree(circularArrow(false, false))),
|
||||
render(tree(circularArrow(false, true))), false);
|
||||
}
|
||||
|
||||
/**
|
||||
* Зеркало с AA-допуском: Java2D сглаживает путь в устройственных
|
||||
* координатах, поэтому зеркало совпадает с точностью до краевых
|
||||
* пикселей. Проверяем: ни одного пикселя с инверсией заливки
|
||||
* (|Δальфа| > 128) и доля отличающихся краевых пикселей мала,
|
||||
* при этом flip обязан изменить асимметричную фигуру.
|
||||
*/
|
||||
private static void assertMirror(BufferedImage plain, BufferedImage flipped, boolean horiz) {
|
||||
int w = plain.getWidth();
|
||||
int h = plain.getHeight();
|
||||
int edgeDiff = 0;
|
||||
int inversions = 0;
|
||||
int changed = 0;
|
||||
for (int y = 0; y < h; y++) {
|
||||
for (int x = 0; x < w; x++) {
|
||||
int p = horiz ? plain.getRGB(w - 1 - x, y) : plain.getRGB(x, h - 1 - y);
|
||||
int f = flipped.getRGB(x, y);
|
||||
int da = Math.abs(((p >>> 24) & 0xFF) - ((f >>> 24) & 0xFF));
|
||||
if (da > AA_INVERSION_ALPHA) {
|
||||
inversions++;
|
||||
}
|
||||
if (da > AA_EDGE_ALPHA) {
|
||||
edgeDiff++;
|
||||
}
|
||||
if (Math.abs(((plain.getRGB(x, y) >>> 24) & 0xFF)
|
||||
- ((f >>> 24) & 0xFF)) > AA_EDGE_ALPHA) {
|
||||
changed++;
|
||||
}
|
||||
}
|
||||
}
|
||||
assertEquals(0, inversions, "инверсии заливки против зеркала");
|
||||
assertTrue(edgeDiff < w * h / 20, "краевых расхождений слишком много: " + edgeDiff);
|
||||
assertTrue(changed > w * h / 100, "flip не изменил фигуру: " + changed);
|
||||
}
|
||||
|
||||
private static CTShape circularArrow(boolean flipH, boolean flipV) {
|
||||
CTShape sp = new CTShape();
|
||||
CTShapeProperties spPr = new CTShapeProperties();
|
||||
CTTransform2D t = new CTTransform2D();
|
||||
t.setOff(point(0, 0));
|
||||
t.setExt(size(1_000_000, 1_000_000));
|
||||
t.setFlipH(flipH);
|
||||
t.setFlipV(flipV);
|
||||
spPr.setXfrm(t);
|
||||
CTPresetGeometry2D pg = new CTPresetGeometry2D();
|
||||
pg.setPrst(STShapeType.CIRCULAR_ARROW);
|
||||
spPr.setPrstGeom(pg);
|
||||
CTSolidColorFillProperties fill = new CTSolidColorFillProperties();
|
||||
CTSRgbColor c = new CTSRgbColor();
|
||||
c.setVal("ED7D31");
|
||||
fill.setSrgbClr(c);
|
||||
spPr.setSolidFill(fill);
|
||||
sp.setSpPr(spPr);
|
||||
return sp;
|
||||
}
|
||||
|
||||
/** MS-ODRAWXML / Annex L.4.7.4: child-space группы масштабируется в ext (2×). */
|
||||
@Test
|
||||
void grpSpChildMappedIntoParentSpace() {
|
||||
CTGroupShape gs = new CTGroupShape();
|
||||
CTGroupShapeProperties gp = new CTGroupShapeProperties();
|
||||
CTGroupTransform2D gx = new CTGroupTransform2D();
|
||||
gx.setOff(point(0, 0));
|
||||
gx.setExt(size(2000, 2000));
|
||||
gx.setChOff(point(0, 0));
|
||||
gx.setChExt(size(1000, 1000));
|
||||
gp.setXfrm(gx);
|
||||
gs.setGrpSpPr(gp);
|
||||
gs.getSpOrGrpSp().add(rect(0, 0, 1000, 1000, false));
|
||||
gs.getSpOrGrpSp().add(rect(250, 250, 250, 250, true));
|
||||
BufferedImage img = render(tree(gs));
|
||||
assertTrue(reddish(img, 0.375, 0.375), "ребёнок (250..500)/1000 -> (500..1000)/2000");
|
||||
assertTrue(transparent(img, 0.75, 0.75), "правый нижний квадрант пуст");
|
||||
assertTrue(transparent(img, 0.1, 0.1), "левый верхний квадрант пуст");
|
||||
}
|
||||
|
||||
/** Annex L.4.7.4: rot группы — о центр ext-бокса, ребёнок справа уходит вниз. */
|
||||
@Test
|
||||
void grpSpRotationMovesChild() {
|
||||
CTGroupShape gs = new CTGroupShape();
|
||||
CTGroupShapeProperties gp = new CTGroupShapeProperties();
|
||||
CTGroupTransform2D gx = new CTGroupTransform2D();
|
||||
gx.setOff(point(0, 0));
|
||||
gx.setExt(size(2000, 2000));
|
||||
gx.setChOff(point(0, 0));
|
||||
gx.setChExt(size(2000, 2000));
|
||||
gx.setRot(5400000);
|
||||
gp.setXfrm(gx);
|
||||
gs.setGrpSpPr(gp);
|
||||
gs.getSpOrGrpSp().add(rect(0, 0, 2000, 2000, false));
|
||||
gs.getSpOrGrpSp().add(rect(1250, 750, 500, 500, true));
|
||||
BufferedImage img = render(tree(gs));
|
||||
assertTrue(reddish(img, 0.5, 0.75), "после 90° по часовой ребёнок под центром");
|
||||
assertTrue(transparent(img, 0.75, 0.5), "справа от центра пусто");
|
||||
}
|
||||
|
||||
/** Группа без grpSpPr/xfrm — дети проходят без маппинга. */
|
||||
@Test
|
||||
void grpSpWithoutXfrmPassThrough() {
|
||||
CTGroupShape gs = new CTGroupShape();
|
||||
gs.getSpOrGrpSp().add(rect(0, 0, 1000, 1000, true));
|
||||
BufferedImage img = render(tree(gs));
|
||||
assertTrue(reddish(img, 0.5, 0.5), "дочерний rect отрендерен как есть");
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user