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:
@@ -27,8 +27,16 @@ import java.util.Map;
|
||||
|
||||
/**
|
||||
* Палитра цветов DrawingML: цвета схемы из word/theme/theme1.xml плюс
|
||||
* разбор {@code a:color} (srgbClr / schemeClr / sysClr / hslClr) с
|
||||
* трансформациями (lumMod, lumOff, tint, shade, satMod, hueOff, alpha...).
|
||||
* разбор {@code a:color} (srgbClr / scrgbClr / hslClr / sysClr /
|
||||
* schemeClr / prstClr) с полным набором трансформаций EG_ColorTransform
|
||||
* (§20.1.2.3.2-28: lum/sat/hue Mod/Off и абсолютные, tint/shade,
|
||||
* alpha/alphaMod/alphaOff, red/green/blue + Mod/Off, comp, inv, gray,
|
||||
* gamma/invGamma).
|
||||
*
|
||||
* tint/shade — модуляция светлоты в HSL (L' = L·p + (1−p) / L·p,
|
||||
* MS-OI29500 §17.3.2.6(a) — поведение Word); ECMA-примеры именно для
|
||||
* tint/shade (00BC00) противоречат его же примерам семейства lum/sat —
|
||||
* расхождение на стороне спецификации.
|
||||
*
|
||||
* Нужен и для графиков (c:solidFill / a:solidFill), и для SmartArt: оба
|
||||
* используют одни и те же ссылки на цвета темы (accent1..6, tx1, lt1).
|
||||
@@ -50,9 +58,222 @@ final class DrawMlColor {
|
||||
"hlink", "0563C1", "folHlink", "954F72",
|
||||
};
|
||||
|
||||
/** Word: bg1/tx1 — псевдонимы lt1/dk1. */
|
||||
/**
|
||||
* Базовые цвета a:prstClr — таблица ST_PresetColorVal (§20.1.10.48,
|
||||
* 190 имён) дословно из ECMA-376 Part 1, включая собственную странность
|
||||
* спеки: ltGoldenrodYellow = (250,250,120), а не X11 (250,250,210).
|
||||
* Регрессия — DrawMlColorTest#prstClrResolvedWithTransforms.
|
||||
*/
|
||||
static final Map<String, Color> PRESET_COLORS = presetColors();
|
||||
|
||||
private static Map<String, Color> presetColors() {
|
||||
String[] rows = {
|
||||
"aliceBlue 240,248,255",
|
||||
"antiqueWhite 250,235,215",
|
||||
"aqua 0,255,255",
|
||||
"aquamarine 127,255,212",
|
||||
"azure 240,255,255",
|
||||
"beige 245,245,220",
|
||||
"bisque 255,228,196",
|
||||
"black 0,0,0",
|
||||
"blanchedAlmond 255,235,205",
|
||||
"blue 0,0,255",
|
||||
"blueViolet 138,43,226",
|
||||
"brown 165,42,42",
|
||||
"burlyWood 222,184,135",
|
||||
"cadetBlue 95,158,160",
|
||||
"chartreuse 127,255,0",
|
||||
"chocolate 210,105,30",
|
||||
"coral 255,127,80",
|
||||
"cornflowerBlue 100,149,237",
|
||||
"cornsilk 255,248,220",
|
||||
"crimson 220,20,60",
|
||||
"cyan 0,255,255",
|
||||
"darkBlue 0,0,139",
|
||||
"darkCyan 0,139,139",
|
||||
"darkGoldenrod 184,134,11",
|
||||
"darkGray 169,169,169",
|
||||
"darkGrey 169,169,169",
|
||||
"darkGreen 0,100,0",
|
||||
"darkKhaki 189,183,107",
|
||||
"darkMagenta 139,0,139",
|
||||
"darkOliveGreen 85,107,47",
|
||||
"darkOrange 255,140,0",
|
||||
"darkOrchid 153,50,204",
|
||||
"darkRed 139,0,0",
|
||||
"darkSalmon 233,150,122",
|
||||
"darkSeaGreen 143,188,143",
|
||||
"darkSlateBlue 72,61,139",
|
||||
"darkSlateGray 47,79,79",
|
||||
"darkSlateGrey 47,79,79",
|
||||
"darkTurquoise 0,206,209",
|
||||
"darkViolet 148,0,211",
|
||||
"dkBlue 0,0,139",
|
||||
"dkCyan 0,139,139",
|
||||
"dkGoldenrod 184,134,11",
|
||||
"dkGray 169,169,169",
|
||||
"dkGrey 169,169,169",
|
||||
"dkGreen 0,100,0",
|
||||
"dkKhaki 189,183,107",
|
||||
"dkMagenta 139,0,139",
|
||||
"dkOliveGreen 85,107,47",
|
||||
"dkOrange 255,140,0",
|
||||
"dkOrchid 153,50,204",
|
||||
"dkRed 139,0,0",
|
||||
"dkSalmon 233,150,122",
|
||||
"dkSeaGreen 143,188,139",
|
||||
"dkSlateBlue 72,61,139",
|
||||
"dkSlateGray 47,79,79",
|
||||
"dkSlateGrey 47,79,79",
|
||||
"dkTurquoise 0,206,209",
|
||||
"dkViolet 148,0,211",
|
||||
"deepPink 255,20,147",
|
||||
"deepSkyBlue 0,191,255",
|
||||
"dimGray 105,105,105",
|
||||
"dimGrey 105,105,105",
|
||||
"dodgerBlue 30,144,255",
|
||||
"firebrick 178,34,34",
|
||||
"floralWhite 255,250,240",
|
||||
"forestGreen 34,139,34",
|
||||
"fuchsia 255,0,255",
|
||||
"gainsboro 220,220,220",
|
||||
"ghostWhite 248,248,255",
|
||||
"gold 255,215,0",
|
||||
"goldenrod 218,165,32",
|
||||
"gray 128,128,128",
|
||||
"grey 128,128,128",
|
||||
"green 0,128,0",
|
||||
"greenYellow 173,255,47",
|
||||
"honeydew 240,255,240",
|
||||
"hotPink 255,105,180",
|
||||
"indianRed 205,92,92",
|
||||
"indigo 75,0,130",
|
||||
"ivory 255,255,240",
|
||||
"khaki 240,230,140",
|
||||
"lavender 230,230,250",
|
||||
"lavenderBlush 255,240,245",
|
||||
"lawnGreen 124,252,0",
|
||||
"lemonChiffon 255,250,205",
|
||||
"lightBlue 173,216,230",
|
||||
"lightCoral 240,128,128",
|
||||
"lightCyan 224,255,255",
|
||||
"lightGoldenrodYellow 250,250,210",
|
||||
"lightGray 211,211,211",
|
||||
"lightGrey 211,211,211",
|
||||
"lightGreen 144,238,144",
|
||||
"lightPink 255,182,193",
|
||||
"lightSalmon 255,160,122",
|
||||
"lightSeaGreen 32,178,170",
|
||||
"lightSkyBlue 135,206,250",
|
||||
"lightSlateGray 119,136,153",
|
||||
"lightSlateGrey 119,136,153",
|
||||
"lightSteelBlue 176,196,222",
|
||||
"lightYellow 255,255,224",
|
||||
"ltBlue 173,216,230",
|
||||
"ltCoral 240,128,128",
|
||||
"ltCyan 224,255,255",
|
||||
"ltGoldenrodYellow 250,250,120",
|
||||
"ltGray 211,211,211",
|
||||
"ltGrey 211,211,211",
|
||||
"ltGreen 144,238,144",
|
||||
"ltPink 255,182,193",
|
||||
"ltSalmon 255,160,122",
|
||||
"ltSeaGreen 32,178,170",
|
||||
"ltSkyBlue 135,206,250",
|
||||
"ltSlateGray 119,136,153",
|
||||
"ltSlateGrey 119,136,153",
|
||||
"ltSteelBlue 176,196,222",
|
||||
"ltYellow 255,255,224",
|
||||
"lime 0,255,0",
|
||||
"limeGreen 50,205,50",
|
||||
"linen 250,240,230",
|
||||
"magenta 255,0,255",
|
||||
"maroon 128,0,0",
|
||||
"medAquamarine 102,205,170",
|
||||
"medBlue 0,0,205",
|
||||
"medOrchid 186,85,211",
|
||||
"medPurple 147,112,219",
|
||||
"medSeaGreen 60,179,113",
|
||||
"medSlateBlue 123,104,238",
|
||||
"medSpringGreen 0,250,154",
|
||||
"medTurquoise 72,209,204",
|
||||
"medVioletRed 199,21,133",
|
||||
"mediumAquamarine 102,205,170",
|
||||
"mediumBlue 0,0,205",
|
||||
"mediumOrchid 186,85,211",
|
||||
"mediumPurple 147,112,219",
|
||||
"mediumSeaGreen 60,179,113",
|
||||
"mediumSlateBlue 123,104,238",
|
||||
"mediumSpringGreen 0,250,154",
|
||||
"mediumTurquoise 72,209,204",
|
||||
"mediumVioletRed 199,21,133",
|
||||
"midnightBlue 25,25,112",
|
||||
"mintCream 245,255,250",
|
||||
"mistyRose 255,228,225",
|
||||
"moccasin 255,228,181",
|
||||
"navajoWhite 255,222,173",
|
||||
"navy 0,0,128",
|
||||
"oldLace 253,245,230",
|
||||
"olive 128,128,0",
|
||||
"oliveDrab 107,142,35",
|
||||
"orange 255,165,0",
|
||||
"orangeRed 255,69,0",
|
||||
"orchid 218,112,214",
|
||||
"paleGoldenrod 238,232,170",
|
||||
"paleGreen 152,251,152",
|
||||
"paleTurquoise 175,238,238",
|
||||
"paleVioletRed 219,112,147",
|
||||
"papayaWhip 255,239,213",
|
||||
"peachPuff 255,218,185",
|
||||
"peru 205,133,63",
|
||||
"pink 255,192,203",
|
||||
"plum 221,160,221",
|
||||
"powderBlue 176,224,230",
|
||||
"purple 128,0,128",
|
||||
"red 255,0,0",
|
||||
"rosyBrown 188,143,143",
|
||||
"royalBlue 65,105,225",
|
||||
"saddleBrown 139,69,19",
|
||||
"salmon 250,128,114",
|
||||
"sandyBrown 244,164,96",
|
||||
"seaGreen 46,139,87",
|
||||
"seaShell 255,245,238",
|
||||
"sienna 160,82,45",
|
||||
"silver 192,192,192",
|
||||
"skyBlue 135,206,235",
|
||||
"slateBlue 106,90,205",
|
||||
"slateGray 112,128,144",
|
||||
"slateGrey 112,128,144",
|
||||
"snow 255,250,250",
|
||||
"springGreen 0,255,127",
|
||||
"steelBlue 70,130,180",
|
||||
"tan 210,180,140",
|
||||
"teal 0,128,128",
|
||||
"thistle 216,191,216",
|
||||
"tomato 255,99,71",
|
||||
"turquoise 64,224,208",
|
||||
"violet 238,130,238",
|
||||
"wheat 245,222,179",
|
||||
"white 255,255,255",
|
||||
"whiteSmoke 245,245,245",
|
||||
"yellow 255,255,0",
|
||||
"yellowGreen 154,205,50"
|
||||
};
|
||||
Map<String, Color> m = new HashMap<>();
|
||||
for (String row : rows) {
|
||||
int sp = row.indexOf(' ');
|
||||
String[] rgb = row.substring(sp + 1).split(",");
|
||||
m.put(row.substring(0, sp), new Color(Integer.parseInt(rgb[0]),
|
||||
Integer.parseInt(rgb[1]), Integer.parseInt(rgb[2])));
|
||||
}
|
||||
return Map.copyOf(m);
|
||||
}
|
||||
|
||||
/** Word: bg1/tx1/bg2/tx2 — псевдонимы lt1/dk1/lt2/dk2 (§20.1.10.54). */
|
||||
private static final String ALIAS_BG1 = "bg1";
|
||||
private static final String ALIAS_TX1 = "tx1";
|
||||
private static final String ALIAS_BG2 = "bg2";
|
||||
private static final String ALIAS_TX2 = "tx2";
|
||||
|
||||
DrawMlColor(Theme theme) {
|
||||
for (int i = 0; i < OFFICE_DEFAULT.length; i += 2) {
|
||||
@@ -115,11 +336,15 @@ final class DrawMlColor {
|
||||
return Color.BLACK;
|
||||
}
|
||||
String n = name.toLowerCase(Locale.ROOT);
|
||||
// Word: bg1/tx1 — псевдонимы lt1/dk1
|
||||
// Word: bg1/tx1/bg2/tx2 — псевдонимы lt1/dk1/lt2/dk2 (§20.1.10.54)
|
||||
if (ALIAS_BG1.equals(n)) {
|
||||
n = "lt1";
|
||||
} else if (ALIAS_TX1.equals(n)) {
|
||||
n = "dk1";
|
||||
} else if (ALIAS_BG2.equals(n)) {
|
||||
n = "lt2";
|
||||
} else if (ALIAS_TX2.equals(n)) {
|
||||
n = "dk2";
|
||||
}
|
||||
Color c = scheme.get(n);
|
||||
return c != null ? c : Color.BLACK;
|
||||
@@ -141,63 +366,127 @@ final class DrawMlColor {
|
||||
if (transforms.isEmpty()) {
|
||||
return base;
|
||||
}
|
||||
double[] hsl = RgbHsl.toHsl(base);
|
||||
int alpha = 255;
|
||||
boolean hslDirty = false;
|
||||
// rgb — единственный источник истины; HSL-трансформации перед
|
||||
// применением пересчитывают hsl из rgb и пишут результат обратно,
|
||||
// поэтому смешанные цепочки (inv + lumMod) не теряют шагов.
|
||||
Color rgb = base;
|
||||
double[] hsl;
|
||||
for (JAXBElement<?> el : transforms) {
|
||||
String kind = el.getName().getLocalPart();
|
||||
int val = percentOf(el.getValue());
|
||||
if (val == Integer.MIN_VALUE) {
|
||||
continue;
|
||||
}
|
||||
double p = val / 100000.0;
|
||||
switch (kind) {
|
||||
case "lumMod" -> {
|
||||
hsl = RgbHsl.toHsl(toRgb(hsl));
|
||||
hsl[2] = clamp01(hsl[2] * p);
|
||||
hslDirty = true;
|
||||
// Безаргументные трансформации: val не читают (§20.1.2.3.7/.17/.9/.8/.18).
|
||||
case "comp" -> {
|
||||
int mx = Math.max(rgb.getRed(), Math.max(rgb.getGreen(), rgb.getBlue()));
|
||||
int mn = Math.min(rgb.getRed(), Math.min(rgb.getGreen(), rgb.getBlue()));
|
||||
rgb = new Color(clamp255(mx + mn - rgb.getRed()),
|
||||
clamp255(mx + mn - rgb.getGreen()),
|
||||
clamp255(mx + mn - rgb.getBlue()));
|
||||
}
|
||||
case "lumOff" -> {
|
||||
hsl = RgbHsl.toHsl(toRgb(hsl));
|
||||
hsl[2] = clamp01(hsl[2] + p);
|
||||
hslDirty = true;
|
||||
}
|
||||
case "satMod" -> {
|
||||
hsl = RgbHsl.toHsl(toRgb(hsl));
|
||||
hsl[1] = clamp01(hsl[1] * p);
|
||||
hslDirty = true;
|
||||
}
|
||||
case "satOff" -> {
|
||||
hsl = RgbHsl.toHsl(toRgb(hsl));
|
||||
hsl[1] = clamp01(hsl[1] + p);
|
||||
hslDirty = true;
|
||||
}
|
||||
case "hueMod" -> {
|
||||
hsl = RgbHsl.toHsl(toRgb(hsl));
|
||||
hsl[0] = hsl[0] * p % 360.0;
|
||||
hslDirty = true;
|
||||
}
|
||||
case "hueOff" -> {
|
||||
hsl = RgbHsl.toHsl(toRgb(hsl));
|
||||
hsl[0] = (hsl[0] + val / 60000.0) % 360.0;
|
||||
hslDirty = true;
|
||||
}
|
||||
case "tint" -> rgb = tint(rgb, p);
|
||||
case "shade" -> rgb = scaleRgb(rgb, p);
|
||||
case "alpha" -> alpha = clamp255((int) Math.round(alpha * p));
|
||||
case "alphaOff" -> alpha = clamp255((int) Math.round(clamp01((alpha / 255.0) + p) * 255));
|
||||
case "grayscl" -> {
|
||||
double lum = 0.299 * rgb.getRed() + 0.587 * rgb.getGreen() + 0.114 * rgb.getBlue();
|
||||
int l = clamp255((int) Math.round(lum));
|
||||
case "inv" -> rgb = new Color(255 - rgb.getRed(), 255 - rgb.getGreen(),
|
||||
255 - rgb.getBlue());
|
||||
case "gray" -> {
|
||||
int l = clamp255((int) Math.round(0.299 * rgb.getRed()
|
||||
+ 0.587 * rgb.getGreen() + 0.114 * rgb.getBlue()));
|
||||
rgb = new Color(l, l, l);
|
||||
}
|
||||
default -> { /* прочие трансформации не поддерживаются */ }
|
||||
case "gamma" -> rgb = new Color(applyGamma(rgb.getRed()),
|
||||
applyGamma(rgb.getGreen()), applyGamma(rgb.getBlue()));
|
||||
case "invGamma" -> rgb = new Color(applyInvGamma(rgb.getRed()),
|
||||
applyInvGamma(rgb.getGreen()), applyInvGamma(rgb.getBlue()));
|
||||
default -> {
|
||||
int val = percentOf(el.getValue());
|
||||
if (val == Integer.MIN_VALUE) {
|
||||
continue;
|
||||
}
|
||||
double p = val / 100000.0;
|
||||
switch (kind) {
|
||||
case "lumMod" -> {
|
||||
hsl = RgbHsl.toHsl(rgb);
|
||||
hsl[2] = clamp01(hsl[2] * p);
|
||||
rgb = toRgb(hsl);
|
||||
}
|
||||
case "lumOff" -> {
|
||||
hsl = RgbHsl.toHsl(rgb);
|
||||
hsl[2] = clamp01(hsl[2] + p);
|
||||
rgb = toRgb(hsl);
|
||||
}
|
||||
case "satMod" -> {
|
||||
hsl = RgbHsl.toHsl(rgb);
|
||||
hsl[1] = clamp01(hsl[1] * p);
|
||||
rgb = toRgb(hsl);
|
||||
}
|
||||
case "satOff" -> {
|
||||
hsl = RgbHsl.toHsl(rgb);
|
||||
hsl[1] = clamp01(hsl[1] + p);
|
||||
rgb = toRgb(hsl);
|
||||
}
|
||||
case "hueMod" -> {
|
||||
hsl = RgbHsl.toHsl(rgb);
|
||||
hsl[0] = hsl[0] * p % 360.0;
|
||||
rgb = toRgb(hsl);
|
||||
}
|
||||
case "hueOff" -> {
|
||||
hsl = RgbHsl.toHsl(rgb);
|
||||
hsl[0] = (hsl[0] + val / 60000.0) % 360.0;
|
||||
rgb = toRgb(hsl);
|
||||
}
|
||||
// §20.1.2.3.31/.34: Office-семантика — модуляция
|
||||
// светлоты в HSL (MS-OI29500 §17.3.2.6(a)), не
|
||||
// гамма-микс; ECMA-примеры tint/shade противоречат
|
||||
// собственному семейству lum/sat (§20.1.2.3.19-28).
|
||||
case "tint" -> {
|
||||
hsl = RgbHsl.toHsl(rgb);
|
||||
hsl[2] = clamp01(hsl[2] * p + (1 - p));
|
||||
rgb = toRgb(hsl);
|
||||
}
|
||||
case "shade" -> {
|
||||
hsl = RgbHsl.toHsl(rgb);
|
||||
hsl[2] = clamp01(hsl[2] * p);
|
||||
rgb = toRgb(hsl);
|
||||
}
|
||||
case "hue" -> {
|
||||
hsl = RgbHsl.toHsl(rgb);
|
||||
hsl[0] = (val / 60000.0 % 360.0 + 360.0) % 360.0;
|
||||
rgb = toRgb(hsl);
|
||||
}
|
||||
case "sat" -> {
|
||||
hsl = RgbHsl.toHsl(rgb);
|
||||
hsl[1] = clamp01(p);
|
||||
rgb = toRgb(hsl);
|
||||
}
|
||||
case "lum" -> {
|
||||
hsl = RgbHsl.toHsl(rgb);
|
||||
hsl[2] = clamp01(p);
|
||||
rgb = toRgb(hsl);
|
||||
}
|
||||
case "alpha" -> alpha = clamp255((int) Math.round(alpha * p));
|
||||
case "alphaMod" -> alpha = clamp255((int) Math.round(alpha * p));
|
||||
case "alphaOff" -> alpha = clamp255(
|
||||
(int) Math.round(clamp01((alpha / 255.0) + p) * 255));
|
||||
case "red" -> rgb = withChannel(rgb, 0,
|
||||
clamp255((int) Math.round(255 * p)));
|
||||
case "redMod" -> rgb = withChannel(rgb, 0,
|
||||
clamp255((int) Math.round(rgb.getRed() * p)));
|
||||
case "redOff" -> rgb = withChannel(rgb, 0,
|
||||
clamp255((int) Math.round(rgb.getRed() + 255 * p)));
|
||||
case "green" -> rgb = withChannel(rgb, 1,
|
||||
clamp255((int) Math.round(255 * p)));
|
||||
case "greenMod" -> rgb = withChannel(rgb, 1,
|
||||
clamp255((int) Math.round(rgb.getGreen() * p)));
|
||||
case "greenOff" -> rgb = withChannel(rgb, 1,
|
||||
clamp255((int) Math.round(rgb.getGreen() + 255 * p)));
|
||||
case "blue" -> rgb = withChannel(rgb, 2,
|
||||
clamp255((int) Math.round(255 * p)));
|
||||
case "blueMod" -> rgb = withChannel(rgb, 2,
|
||||
clamp255((int) Math.round(rgb.getBlue() * p)));
|
||||
case "blueOff" -> rgb = withChannel(rgb, 2,
|
||||
clamp255((int) Math.round(rgb.getBlue() + 255 * p)));
|
||||
default -> { /* прочие трансформации не поддерживаются */ }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (hslDirty) {
|
||||
rgb = toRgb(hsl);
|
||||
}
|
||||
return alpha == 255 ? rgb
|
||||
: new Color(rgb.getRed(), rgb.getGreen(), rgb.getBlue(), clamp255(alpha));
|
||||
}
|
||||
@@ -262,20 +551,34 @@ final class DrawMlColor {
|
||||
return v == null ? null : schemeColor(v.value());
|
||||
}
|
||||
if (c.getScrgbClr() != null) {
|
||||
// §20.1.2.3.30: каналы — проценты (100000 = 100%) линейной
|
||||
// гаммы 1.0; в 8 бит — через sRGB-передаточную функцию
|
||||
// (пример спеки: 50% -> BC).
|
||||
CTScRgbColor s = c.getScrgbClr();
|
||||
return new Color(
|
||||
clamp255(Math.round(s.getR() * 255)),
|
||||
clamp255(Math.round(s.getG() * 255)),
|
||||
clamp255(Math.round(s.getB() * 255)));
|
||||
clamp255((int) Math.round(255 * srgbEncode(s.getR() / 100000.0))),
|
||||
clamp255((int) Math.round(255 * srgbEncode(s.getG() / 100000.0))),
|
||||
clamp255((int) Math.round(255 * srgbEncode(s.getB() / 100000.0))));
|
||||
}
|
||||
if (c.getHslClr() != null) {
|
||||
CTHslColor h = c.getHslClr();
|
||||
return RgbHsl.fromHsl(h.getHue() / 60000.0, h.getSat() / 100000.0, h.getLum() / 100000.0);
|
||||
}
|
||||
if (c.getSysClr() != null) {
|
||||
// §20.1.2.3.33, §20.1.10.58: при отсутствии системных цветов
|
||||
// приложение обязано использовать lastClr; иначе — эвристика
|
||||
// window/windowText.
|
||||
CTSystemColor s = c.getSysClr();
|
||||
byte[] last = s.getLastClr();
|
||||
if (last != null && last.length > 0) {
|
||||
return decodeHex(hexOf(last));
|
||||
}
|
||||
return "window".equalsIgnoreCase(s.getVal()) ? Color.WHITE : Color.BLACK;
|
||||
}
|
||||
if (c.getPrstClr() != null && c.getPrstClr().getVal() != null) {
|
||||
// §20.1.2.3.22: базовый цвет из таблицы ST_PresetColorVal.
|
||||
return PRESET_COLORS.get(c.getPrstClr().getVal().value());
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -289,6 +592,15 @@ final class DrawMlColor {
|
||||
if (c.getSysClr() != null) {
|
||||
return c.getSysClr().getEGColorTransform();
|
||||
}
|
||||
if (c.getScrgbClr() != null) {
|
||||
return c.getScrgbClr().getEGColorTransform();
|
||||
}
|
||||
if (c.getHslClr() != null) {
|
||||
return c.getHslClr().getEGColorTransform();
|
||||
}
|
||||
if (c.getPrstClr() != null) {
|
||||
return c.getPrstClr().getEGColorTransform();
|
||||
}
|
||||
return java.util.List.of();
|
||||
}
|
||||
|
||||
@@ -315,21 +627,52 @@ final class DrawMlColor {
|
||||
return Integer.MIN_VALUE;
|
||||
}
|
||||
|
||||
/** Осветление: c*p + white*(1-p) (a:tint в DrawingML). */
|
||||
static Color tint(Color c, double p) {
|
||||
return new Color(
|
||||
clamp255((int) Math.round(c.getRed() * p + 255 * (1 - p))),
|
||||
clamp255((int) Math.round(c.getGreen() * p + 255 * (1 - p))),
|
||||
clamp255((int) Math.round(c.getBlue() * p + 255 * (1 - p))));
|
||||
}
|
||||
|
||||
/** Затемнение: c*p (a:shade). */
|
||||
/** Затемнение: c*p (используется боковыми гранями 3D через {@link #darken}). */
|
||||
static Color scaleRgb(Color c, double p) {
|
||||
return new Color(clamp255((int) Math.round(c.getRed() * p)),
|
||||
clamp255((int) Math.round(c.getGreen() * p)),
|
||||
clamp255((int) Math.round(c.getBlue() * p)));
|
||||
}
|
||||
|
||||
/** sRGB-передаточная функция: линейная гамма 1.0 -> кодированная (§20.1.2.3.30). */
|
||||
private static double srgbEncode(double l) {
|
||||
return l <= 0.0031308 ? 12.92 * l : 1.055 * Math.pow(l, 1.0 / 2.4) - 0.055;
|
||||
}
|
||||
|
||||
/** Обратная sRGB-передаточная функция: кодированная -> линейная (a:gamma). */
|
||||
private static double srgbDecode(double c) {
|
||||
return c <= 0.04045 ? c / 12.92 : Math.pow((c + 0.055) / 1.055, 2.4);
|
||||
}
|
||||
|
||||
/** a:gamma (§20.1.2.3.8): канал в линейную гамму. */
|
||||
private static int applyGamma(int channel) {
|
||||
return clamp255((int) Math.round(255 * srgbDecode(channel / 255.0)));
|
||||
}
|
||||
|
||||
/** a:invGamma (§20.1.2.3.18): канал в sRGB-кодирование. */
|
||||
private static int applyInvGamma(int channel) {
|
||||
return clamp255((int) Math.round(255 * srgbEncode(channel / 255.0)));
|
||||
}
|
||||
|
||||
/** Замена канала 0/1/2 (R/G/B). */
|
||||
private static Color withChannel(Color c, int idx, int value) {
|
||||
return switch (idx) {
|
||||
case 0 -> new Color(value, c.getGreen(), c.getBlue());
|
||||
case 1 -> new Color(c.getRed(), value, c.getBlue());
|
||||
default -> new Color(c.getRed(), c.getGreen(), value);
|
||||
};
|
||||
}
|
||||
|
||||
/** hexBinary (JAXB byte[] у lastClr) -> hex-строка. */
|
||||
private static String hexOf(byte[] bytes) {
|
||||
StringBuilder sb = new StringBuilder(bytes.length * 2);
|
||||
for (byte b : bytes) {
|
||||
sb.append(Character.forDigit((b >> 4) & 0xF, 16));
|
||||
sb.append(Character.forDigit(b & 0xF, 16));
|
||||
}
|
||||
return sb.toString();
|
||||
}
|
||||
|
||||
/** Затемнение на фиксированную долю (для боковых граней 3D). */
|
||||
static Color darken(Color c, double amount) {
|
||||
return scaleRgb(c, 1.0 - amount);
|
||||
|
||||
@@ -995,21 +995,7 @@ final class PresetGeometry {
|
||||
if (preset == null) {
|
||||
return new Rectangle2D.Double(x, y, w, h);
|
||||
}
|
||||
Map<String, Double> env = new HashMap<>();
|
||||
env.put("w", w);
|
||||
env.put("h", h);
|
||||
env.put("ss", Math.min(w, h));
|
||||
env.put("wd2", w / 2.0);
|
||||
env.put("hd2", h / 2.0);
|
||||
env.put("hc", w / 2.0);
|
||||
env.put("vc", h / 2.0);
|
||||
env.put("l", 0.0);
|
||||
env.put("t", 0.0);
|
||||
env.put("r", w);
|
||||
env.put("b", h);
|
||||
env.put("cd2", FULL_ANGLE / 2.0);
|
||||
env.put("cd4", FULL_ANGLE / 4.0);
|
||||
env.put("3cd4", FULL_ANGLE * 3.0 / 4.0);
|
||||
Map<String, Double> env = baseEnv(w, h);
|
||||
for (int i = 0; i < preset.avLst().length; i++) {
|
||||
String[] e = preset.avLst()[i].split(" ", 2);
|
||||
if (adj != null && adj.length > i) {
|
||||
@@ -1034,6 +1020,54 @@ final class PresetGeometry {
|
||||
return area;
|
||||
}
|
||||
|
||||
/**
|
||||
* Окружение вычисления гайдов: w/h + предопределённые переменные
|
||||
* ECMA-376 Part 1 §20.1.10.56 (36 ключей: w, h, ss, wd2…, cd2…, ls,
|
||||
* ssd2…ssd32, hd3…hd8, wd3…wd10, 3cd8/5cd8/7cd8 — углы в
|
||||
* 1/60000 градуса). Регрессия — PresetGeometryTest#intrinsicVariablesComplete.
|
||||
*/
|
||||
static Map<String, Double> baseEnv(double w, double h) {
|
||||
Map<String, Double> env = new HashMap<>();
|
||||
env.put("w", w);
|
||||
env.put("h", h);
|
||||
double ss = Math.min(w, h);
|
||||
env.put("ss", ss);
|
||||
env.put("wd2", w / 2.0);
|
||||
env.put("hd2", h / 2.0);
|
||||
env.put("hc", w / 2.0);
|
||||
env.put("vc", h / 2.0);
|
||||
env.put("l", 0.0);
|
||||
env.put("t", 0.0);
|
||||
env.put("r", w);
|
||||
env.put("b", h);
|
||||
env.put("cd2", FULL_ANGLE / 2.0);
|
||||
env.put("cd4", FULL_ANGLE / 4.0);
|
||||
env.put("3cd4", FULL_ANGLE * 3.0 / 4.0);
|
||||
env.put("cd8", FULL_ANGLE / 8.0);
|
||||
env.put("3cd8", FULL_ANGLE * 3.0 / 8.0);
|
||||
env.put("5cd8", FULL_ANGLE * 5.0 / 8.0);
|
||||
env.put("7cd8", FULL_ANGLE * 7.0 / 8.0);
|
||||
env.put("hd3", h / 3.0);
|
||||
env.put("hd4", h / 4.0);
|
||||
env.put("hd5", h / 5.0);
|
||||
env.put("hd6", h / 6.0);
|
||||
env.put("hd8", h / 8.0);
|
||||
env.put("ls", Math.max(w, h));
|
||||
env.put("ssd2", ss / 2.0);
|
||||
env.put("ssd4", ss / 4.0);
|
||||
env.put("ssd6", ss / 6.0);
|
||||
env.put("ssd8", ss / 8.0);
|
||||
env.put("ssd16", ss / 16.0);
|
||||
env.put("ssd32", ss / 32.0);
|
||||
env.put("wd3", w / 3.0);
|
||||
env.put("wd4", w / 4.0);
|
||||
env.put("wd5", w / 5.0);
|
||||
env.put("wd6", w / 6.0);
|
||||
env.put("wd8", w / 8.0);
|
||||
env.put("wd10", w / 10.0);
|
||||
return env;
|
||||
}
|
||||
|
||||
/**
|
||||
* avLst пресета в int-массив по позициям записей XML
|
||||
* (a:gd name="adjN" fmla="val K" -> [.., K, ..]); неизменяемый.
|
||||
@@ -1088,27 +1122,6 @@ final class PresetGeometry {
|
||||
pos[0]++;
|
||||
return operand(tok, env, pos);
|
||||
}
|
||||
case "+": {
|
||||
pos[0]++;
|
||||
return operand(tok, env, pos) + operand(tok, env, pos);
|
||||
}
|
||||
case "-": {
|
||||
pos[0]++;
|
||||
double a = operand(tok, env, pos);
|
||||
return a - operand(tok, env, pos);
|
||||
}
|
||||
case "*": {
|
||||
pos[0]++;
|
||||
double a = operand(tok, env, pos);
|
||||
double b = operand(tok, env, pos);
|
||||
return a * b / operand(tok, env, pos);
|
||||
}
|
||||
case "/": {
|
||||
pos[0]++;
|
||||
double a = operand(tok, env, pos);
|
||||
double b = operand(tok, env, pos);
|
||||
return (a + b) / operand(tok, env, pos);
|
||||
}
|
||||
case "+-": {
|
||||
pos[0]++;
|
||||
double a = operand(tok, env, pos);
|
||||
@@ -1178,6 +1191,12 @@ final class PresetGeometry {
|
||||
double ang = operand(tok, env, pos);
|
||||
return r * Math.cos(Math.toRadians(ang / DEG_UNITS));
|
||||
}
|
||||
case "tan": {
|
||||
pos[0]++;
|
||||
double r = operand(tok, env, pos);
|
||||
double ang = operand(tok, env, pos);
|
||||
return r * Math.tan(Math.toRadians(ang / DEG_UNITS));
|
||||
}
|
||||
case "at2": {
|
||||
pos[0]++;
|
||||
double x = operand(tok, env, pos);
|
||||
|
||||
+104
-50
@@ -2,6 +2,7 @@ package ru.pjandro.wordpdf.internal.chart;
|
||||
|
||||
import org.docx4j.dml.CTGradientFillProperties;
|
||||
import org.docx4j.dml.CTGradientStop;
|
||||
import org.docx4j.dml.CTGroupTransform2D;
|
||||
import org.docx4j.dml.CTPoint2D;
|
||||
import org.docx4j.dml.CTPositiveSize2D;
|
||||
import org.docx4j.dml.CTPresetGeometry2D;
|
||||
@@ -16,6 +17,7 @@ import org.docx4j.dml.diagram.CTDataModel;
|
||||
import org.docx4j.dml.diagram.STCxnType;
|
||||
import org.docx4j.dml.diagram.CTPt;
|
||||
import org.docx4j.dml.diagram2008.CTDrawing;
|
||||
import org.docx4j.dml.diagram2008.CTGroupShape;
|
||||
import org.docx4j.dml.diagram2008.CTShape;
|
||||
|
||||
import java.awt.BasicStroke;
|
||||
@@ -36,6 +38,12 @@ import java.util.Map;
|
||||
* позиция, пресет геометрии, заливка, обводка и текст. Поэтому
|
||||
* собственный движок раскладки SmartArt не нужен.
|
||||
*
|
||||
* Фигуры обходятся рекурсивно: dsp:spTree допускает вложенные
|
||||
* {@code dsp:grpSp} с {@code CT_GroupTransform2D} (MS-ODRAWXML:
|
||||
* spTree — CT_GroupShape); flipH/flipV применяются ДО rotation и оба
|
||||
* относительно центра bounding box (ECMA-376 §20.1.7.6, Annex L.4.7.3
|
||||
* и L.4.7.4). Регрессии — SmartArtRendererTest.
|
||||
*
|
||||
* Пустые подписи фигур Word показывает текстом-заполнителем из
|
||||
* {@code data1.xml} (dgm:pt/dgm:prSet/@phldrT) — его берём оттуда же.
|
||||
*/
|
||||
@@ -43,8 +51,6 @@ final class SmartArtRenderer {
|
||||
|
||||
static final int DPI = ChartRenderer.DPI;
|
||||
|
||||
/** Порог «фигура повёрнута», градусы: меньше — поворот незначим. */
|
||||
private static final double ROTATION_EPSILON_DEG = 0.01;
|
||||
|
||||
/** Дефолтные insets bodyPr (ECMA-376 CT_TextBodyProperties), pt. */
|
||||
private static final double DEFAULT_LR_INS_PT = 7.2;
|
||||
@@ -69,30 +75,14 @@ final class SmartArtRenderer {
|
||||
private SmartArtRenderer() {
|
||||
}
|
||||
|
||||
private record Item(CTShape shape, double x, double y, double w, double h, double rotDeg) {
|
||||
/** Фигура: локальное пространство (0,0,w,h) -> координаты проекта (pt). */
|
||||
private record Item(CTShape shape, AffineTransform toDiagram, double w, double h) {
|
||||
}
|
||||
|
||||
static BufferedImage render(CTDrawing drawing, CTDataModel data, DrawMlColor colors,
|
||||
double widthPt, double heightPt) {
|
||||
List<Item> items = new ArrayList<>();
|
||||
for (Object o : drawing.getSpTree().getSpOrGrpSp()) {
|
||||
if (!(o instanceof CTShape sp)) {
|
||||
continue;
|
||||
}
|
||||
CTTransform2D t = sp.getSpPr() == null ? null : sp.getSpPr().getXfrm();
|
||||
if (t == null || t.getExt() == null) {
|
||||
continue;
|
||||
}
|
||||
CTPoint2D off = t.getOff();
|
||||
CTPositiveSize2D ext = t.getExt();
|
||||
double rot = t.getRot() / 60000.0;
|
||||
items.add(new Item(sp,
|
||||
(off == null ? 0 : off.getX()) / 12700.0,
|
||||
(off == null ? 0 : off.getY()) / 12700.0,
|
||||
ext.getCx() / 12700.0,
|
||||
ext.getCy() / 12700.0,
|
||||
rot));
|
||||
}
|
||||
collect(drawing.getSpTree().getSpOrGrpSp(), new AffineTransform(), items);
|
||||
int w = Math.max(16, (int) Math.round(widthPt * DPI / 72.0));
|
||||
int h = Math.max(16, (int) Math.round(heightPt * DPI / 72.0));
|
||||
BufferedImage img = new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB);
|
||||
@@ -113,10 +103,12 @@ final class SmartArtRenderer {
|
||||
double maxX = -Double.MAX_VALUE;
|
||||
double maxY = -Double.MAX_VALUE;
|
||||
for (Item it : items) {
|
||||
minX = Math.min(minX, it.x());
|
||||
minY = Math.min(minY, it.y());
|
||||
maxX = Math.max(maxX, it.x() + it.w());
|
||||
maxY = Math.max(maxY, it.y() + it.h());
|
||||
Rectangle2D b = it.toDiagram().createTransformedShape(
|
||||
new Rectangle2D.Double(0, 0, it.w(), it.h())).getBounds2D();
|
||||
minX = Math.min(minX, b.getMinX());
|
||||
minY = Math.min(minY, b.getMinY());
|
||||
maxX = Math.max(maxX, b.getMaxX());
|
||||
maxY = Math.max(maxY, b.getMaxY());
|
||||
}
|
||||
double mw = Math.max(1e-6, maxX - minX);
|
||||
double mh = Math.max(1e-6, maxY - minY);
|
||||
@@ -128,10 +120,12 @@ final class SmartArtRenderer {
|
||||
double scale = Math.min(widthPt / mw, heightPt / mh);
|
||||
double offX = (widthPt - mw * scale) / 2.0 - minX * scale;
|
||||
double offY = (heightPt - mh * scale) / 2.0 - minY * scale;
|
||||
g.translate(offX, offY);
|
||||
g.scale(scale, scale);
|
||||
|
||||
Map<String, String> placeholders = placeholders(data);
|
||||
for (Item it : items) {
|
||||
drawShape(g, it, colors, scale, offX, offY, placeholders);
|
||||
drawShape(g, it, colors, placeholders);
|
||||
}
|
||||
} finally {
|
||||
g.dispose();
|
||||
@@ -139,6 +133,63 @@ final class SmartArtRenderer {
|
||||
return img;
|
||||
}
|
||||
|
||||
/**
|
||||
* Обход {@code spOrGrpSp}: фигура получает матрицу локального
|
||||
* пространства (0,0,w,h) в координаты проекта (pt); flip — до
|
||||
* rotation, оба о центр bbox (Annex L.4.7.3). Группа: child-space
|
||||
* маппинг {@code T(off)·S(ext/chExt)·T(-chOff)}, поверх — flip/rot
|
||||
* о центр ext-бокса группы (Annex L.4.7.4); без grpSpPr/xfrm дети
|
||||
* проходят как есть.
|
||||
*/
|
||||
private static void collect(List<Object> spOrGrpSp, AffineTransform parent,
|
||||
List<Item> out) {
|
||||
for (Object o : spOrGrpSp) {
|
||||
if (o instanceof CTShape sp) {
|
||||
CTTransform2D t = sp.getSpPr() == null ? null : sp.getSpPr().getXfrm();
|
||||
if (t == null || t.getExt() == null) {
|
||||
continue;
|
||||
}
|
||||
CTPoint2D off = t.getOff();
|
||||
double sw = t.getExt().getCx() / 12700.0;
|
||||
double sh = t.getExt().getCy() / 12700.0;
|
||||
AffineTransform m = new AffineTransform(parent);
|
||||
m.translate(off == null ? 0 : off.getX() / 12700.0,
|
||||
off == null ? 0 : off.getY() / 12700.0);
|
||||
m.translate(sw / 2.0, sh / 2.0);
|
||||
m.rotate(Math.toRadians(t.getRot() / 60000.0));
|
||||
m.scale(t.isFlipH() ? -1 : 1, t.isFlipV() ? -1 : 1);
|
||||
m.translate(-sw / 2.0, -sh / 2.0);
|
||||
out.add(new Item(sp, m, sw, sh));
|
||||
} else if (o instanceof CTGroupShape gs) {
|
||||
AffineTransform m = new AffineTransform(parent);
|
||||
CTGroupTransform2D gx = gs.getGrpSpPr() == null ? null : gs.getGrpSpPr().getXfrm();
|
||||
if (gx != null && gx.getExt() != null) {
|
||||
CTPoint2D goff = gx.getOff();
|
||||
double gx0 = (goff == null ? 0 : goff.getX()) / 12700.0;
|
||||
double gy0 = (goff == null ? 0 : goff.getY()) / 12700.0;
|
||||
double gw = gx.getExt().getCx() / 12700.0;
|
||||
double gh = gx.getExt().getCy() / 12700.0;
|
||||
double gcx = gx0 + gw / 2.0;
|
||||
double gcy = gy0 + gh / 2.0;
|
||||
m.translate(gcx, gcy);
|
||||
m.rotate(Math.toRadians(gx.getRot() / 60000.0));
|
||||
m.scale(gx.isFlipH() ? -1 : 1, gx.isFlipV() ? -1 : 1);
|
||||
m.translate(-gcx, -gcy);
|
||||
m.translate(gx0, gy0);
|
||||
CTPositiveSize2D chExt = gx.getChExt();
|
||||
if (chExt != null && chExt.getCx() > 0 && chExt.getCy() > 0) {
|
||||
m.scale(gw / (chExt.getCx() / 12700.0), gh / (chExt.getCy() / 12700.0));
|
||||
}
|
||||
CTPoint2D chOff = gx.getChOff();
|
||||
if (chOff != null) {
|
||||
m.translate(-chOff.getX() / 12700.0, -chOff.getY() / 12700.0);
|
||||
}
|
||||
}
|
||||
collect(gs.getSpOrGrpSp(), m, out);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Подписи-заполнители. Форма в drawing1.xml ссылается на dgm:pt
|
||||
* type="pres", а phldrT лежит на dgm:pt type="node" — их связывает
|
||||
@@ -184,20 +235,12 @@ final class SmartArtRenderer {
|
||||
}
|
||||
|
||||
private static void drawShape(Graphics2D g, Item it, DrawMlColor colors,
|
||||
double scale, double offX, double offY,
|
||||
Map<String, String> placeholders) {
|
||||
CTShape sp = it.shape();
|
||||
CTShapeProperties spPr = sp.getSpPr();
|
||||
double x = it.x() * scale + offX;
|
||||
double y = it.y() * scale + offY;
|
||||
double sw = it.w() * scale;
|
||||
double sh = it.h() * scale;
|
||||
|
||||
AffineTransform saved = g.getTransform();
|
||||
if (Math.abs(it.rotDeg()) > ROTATION_EPSILON_DEG) {
|
||||
g.rotate(Math.toRadians(it.rotDeg()), x + sw / 2.0, y + sh / 2.0);
|
||||
}
|
||||
|
||||
g.transform(it.toDiagram());
|
||||
String prst = null;
|
||||
int[] adj = new int[0];
|
||||
if (spPr != null && spPr.getPrstGeom() != null) {
|
||||
@@ -205,7 +248,7 @@ final class SmartArtRenderer {
|
||||
prst = pg.getPrst() == null ? null : pg.getPrst().value();
|
||||
adj = PresetGeometry.adjustValues(pg);
|
||||
}
|
||||
java.awt.Shape area = PresetGeometry.build(prst, adj, x, y, sw, sh);
|
||||
java.awt.Shape area = PresetGeometry.build(prst, adj, 0, 0, it.w(), it.h());
|
||||
|
||||
Color fill = resolveFill(spPr, colors);
|
||||
if (fill != null) {
|
||||
@@ -231,30 +274,41 @@ final class SmartArtRenderer {
|
||||
}
|
||||
if (lineColor != null) {
|
||||
g.setColor(lineColor);
|
||||
g.setStroke(new BasicStroke((float) Math.max(0.4, lineWidth * scale)));
|
||||
g.setStroke(new BasicStroke((float) Math.max(0.4, lineWidth)));
|
||||
g.draw(area);
|
||||
}
|
||||
g.setTransform(saved);
|
||||
|
||||
// Текст: собственный прямоугольник (dsp:txXfrm) или границы фигуры
|
||||
double tx = x;
|
||||
double ty = y;
|
||||
double tw = sw;
|
||||
double th = sh;
|
||||
// Текст: Word держит подписи SmartArt горизонтальными — берётся
|
||||
// собственный прямоугольник (dsp:txXfrm — абсолютные координаты
|
||||
// проекта) или axis-aligned огибающий уже трансформированной
|
||||
// фигуры. Прямоугольник — в pt диаграммы; fit-масштаб несёт
|
||||
// трансформ g.
|
||||
double tx;
|
||||
double ty;
|
||||
double tw;
|
||||
double th;
|
||||
CTTransform2D txXfrm = sp.getTxXfrm();
|
||||
if (txXfrm != null && txXfrm.getExt() != null) {
|
||||
CTPoint2D o = txXfrm.getOff();
|
||||
tx = (o == null ? 0 : o.getX()) / 12700.0 * scale + offX;
|
||||
ty = (o == null ? 0 : o.getY()) / 12700.0 * scale + offY;
|
||||
tw = txXfrm.getExt().getCx() / 12700.0 * scale;
|
||||
th = txXfrm.getExt().getCy() / 12700.0 * scale;
|
||||
tx = (o == null ? 0 : o.getX()) / 12700.0;
|
||||
ty = (o == null ? 0 : o.getY()) / 12700.0;
|
||||
tw = txXfrm.getExt().getCx() / 12700.0;
|
||||
th = txXfrm.getExt().getCy() / 12700.0;
|
||||
} else {
|
||||
Rectangle2D b = it.toDiagram().createTransformedShape(
|
||||
new Rectangle2D.Double(0, 0, it.w(), it.h())).getBounds2D();
|
||||
tx = b.getX();
|
||||
ty = b.getY();
|
||||
tw = b.getWidth();
|
||||
th = b.getHeight();
|
||||
}
|
||||
CTTextBodyProperties bodyPr = sp.getTxBody() == null ? null : sp.getTxBody().getBodyPr();
|
||||
if (bodyPr != null) {
|
||||
double insL = inset(bodyPr.getLIns(), DEFAULT_LR_INS_PT) * scale;
|
||||
double insR = inset(bodyPr.getRIns(), DEFAULT_LR_INS_PT) * scale;
|
||||
double insT = inset(bodyPr.getTIns(), DEFAULT_TB_INS_PT) * scale;
|
||||
double insB = inset(bodyPr.getBIns(), DEFAULT_TB_INS_PT) * scale;
|
||||
double insL = inset(bodyPr.getLIns(), DEFAULT_LR_INS_PT);
|
||||
double insR = inset(bodyPr.getRIns(), DEFAULT_LR_INS_PT);
|
||||
double insT = inset(bodyPr.getTIns(), DEFAULT_TB_INS_PT);
|
||||
double insB = inset(bodyPr.getBIns(), DEFAULT_TB_INS_PT);
|
||||
tx += insL;
|
||||
ty += insT;
|
||||
tw -= insL + insR;
|
||||
|
||||
+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