SmartArt: ECMA-376 пресет-геометрия вместо калиброванных коэффициентов
PR checks / java (pull_request) Successful in 47s
PR checks / web (pull_request) Successful in 53s
Main: tests, deploy, autotests / web (push) Successful in 43s
Main: tests, deploy, autotests / java (push) Successful in 45s
Main: tests, deploy, autotests / images-web (push) Successful in 29s
Main: tests, deploy, autotests / images-app (push) Successful in 2m26s
Main: tests, deploy, autotests / deploy (push) Successful in 2m56s
Main: tests, deploy, autotests / autotests (push) Successful in 51s
Main: tests, deploy, autotests / rollback (push) Has been skipped
PR checks / java (pull_request) Successful in 47s
PR checks / web (pull_request) Successful in 53s
Main: tests, deploy, autotests / web (push) Successful in 43s
Main: tests, deploy, autotests / java (push) Successful in 45s
Main: tests, deploy, autotests / images-web (push) Successful in 29s
Main: tests, deploy, autotests / images-app (push) Successful in 2m26s
Main: tests, deploy, autotests / deploy (push) Successful in 2m56s
Main: tests, deploy, autotests / autotests (push) Successful in 51s
Main: tests, deploy, autotests / rollback (push) Has been skipped
PresetGeometry: avLst/gdLst/pathLst семи пресетов (rect, roundRect, ellipse, gear6, gear9, circularArrow, leftCircularArrow) дословно из presetShapeDefinitions.xml + вычислитель префиксных формул ST_GeomGuideFormula. Кольцевые стрелки: оператор ?: = «if x > 0 then y else z» (ISO/IEC 29500-1), углы Arc2D со знаком минус (математическая конвенция). PrstGeomShapes удалён. PresetGeometryTest#tableMatchesEcmaXml пинит синхрон таблицы с копией стандарта (test-ресурс geom/presetShapeDefinitions.xml).
This commit was merged in pull request #33.
This commit is contained in:
@@ -0,0 +1,275 @@
|
||||
package ru.pjandro.wordpdf.internal.chart;
|
||||
|
||||
import org.docx4j.dml.CTGeomGuide;
|
||||
import org.docx4j.dml.CTGeomGuideList;
|
||||
import org.docx4j.dml.CTPresetGeometry2D;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import javax.xml.stream.XMLInputFactory;
|
||||
import javax.xml.stream.XMLStreamConstants;
|
||||
import javax.xml.stream.XMLStreamReader;
|
||||
import java.awt.Shape;
|
||||
import java.awt.geom.PathIterator;
|
||||
import java.awt.geom.Rectangle2D;
|
||||
import java.io.InputStream;
|
||||
import java.util.ArrayList;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertNotEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
/**
|
||||
* Таблица пресетов {@link PresetGeometry} обязана быть дословной копией
|
||||
* блоков ECMA {@code presetShapeDefinitions.xml} (копия стандарта —
|
||||
* тестовый ресурс {@code geom/presetShapeDefinitions.xml}); синхрон
|
||||
* проверяет {@link #tableMatchesEcmaXml()}.
|
||||
*
|
||||
* Геометрические зонды — регрессии разборов, на которых движок уже
|
||||
* спотыкался: оператор {@code ?:} («if x > 0, then y else z», а не
|
||||
* «x != 0») и знаковая конвенция дуг Arc2D. Ошибка в любом из них
|
||||
* превращает кольцевую стрелку в залитый «пакман» без отверстия.
|
||||
*/
|
||||
class PresetGeometryTest {
|
||||
|
||||
private static final double EPS = 1e-6;
|
||||
|
||||
private static final String[] SUPPORTED = {
|
||||
"rect", "roundRect", "ellipse", "gear6", "gear9",
|
||||
"circularArrow", "leftCircularArrow",
|
||||
};
|
||||
|
||||
/** Глубина блока пресета и его секций в дереве StAX (корень — 1). */
|
||||
private static final int DEPTH_BLOCK = 2;
|
||||
private static final int DEPTH_SECTION = 3;
|
||||
|
||||
@Test
|
||||
void tableMatchesEcmaXml() throws Exception {
|
||||
Map<String, PresetGeometry.Preset> fromXml = parseEcmaXml();
|
||||
for (String name : SUPPORTED) {
|
||||
PresetGeometry.Preset expected = fromXml.get(name);
|
||||
PresetGeometry.Preset actual = PresetGeometry.preset(name);
|
||||
assertTrue(expected != null && actual != null, name + " отсутствует");
|
||||
assertArrayEquals(expected.avLst(), actual.avLst(), name + ": avLst");
|
||||
assertArrayEquals(expected.gdLst(), actual.gdLst(), name + ": gdLst");
|
||||
assertArrayEquals(expected.pathLst(), actual.pathLst(), name + ": pathLst");
|
||||
}
|
||||
}
|
||||
|
||||
/** circularArrow: кольцевая полоса сверху (180°→343,76°), отверстие пусто, низ — пасть. */
|
||||
@Test
|
||||
void circularArrowIsRingBandNotDisc() {
|
||||
Shape s = PresetGeometry.build("circularArrow", new int[0], 0, 0, 100, 100);
|
||||
for (double deg : new double[] {200, 270, 340}) {
|
||||
assertTrue(onRing(s, deg, 37.5), "полоса на " + deg + "°");
|
||||
assertFalse(onRing(s, deg, 20), "отверстие на " + deg + "°");
|
||||
}
|
||||
assertFalse(onRing(s, 90, 37.5), "низ — пасть, не полоса");
|
||||
}
|
||||
|
||||
/** leftCircularArrow — зеркало: полоса снизу, пасть сверху. */
|
||||
@Test
|
||||
void leftCircularArrowMirrorsBand() {
|
||||
Shape s = PresetGeometry.build("leftCircularArrow", new int[0], 0, 0, 100, 100);
|
||||
for (double deg : new double[] {20, 90, 160}) {
|
||||
assertTrue(onRing(s, deg, 37.5), "полоса на " + deg + "°");
|
||||
assertFalse(onRing(s, deg, 20), "отверстие на " + deg + "°");
|
||||
}
|
||||
assertFalse(onRing(s, 270, 37.5), "верх — пасть, не полоса");
|
||||
}
|
||||
|
||||
@Test
|
||||
void gearsCoverCenterAndFillCell() {
|
||||
for (String gear : new String[] {"gear6", "gear9"}) {
|
||||
Shape s = PresetGeometry.build(gear, new int[0], 0, 0, 100, 100);
|
||||
assertTrue(s.contains(50, 50), gear + ": центр залит");
|
||||
Rectangle2D b = s.getBounds2D();
|
||||
assertTrue(b.getWidth() > 85 && b.getHeight() > 90, gear + ": " + b);
|
||||
}
|
||||
}
|
||||
|
||||
/** avLst-override доходит до движка: толстая шестерня (adj1=20000) отличается от дефолта. */
|
||||
@Test
|
||||
void adjustOverrideChangesGear() {
|
||||
Shape def = PresetGeometry.build("gear6", new int[0], 0, 0, 100, 100);
|
||||
Shape thick = PresetGeometry.build("gear6", new int[] {20000, 3526}, 0, 0, 100, 100);
|
||||
assertNotEquals(def.getBounds2D(), thick.getBounds2D());
|
||||
assertTrue(thick.contains(50, 50));
|
||||
}
|
||||
|
||||
@Test
|
||||
void roundRectRoundsCorners() {
|
||||
Shape s = PresetGeometry.build("roundRect", new int[0], 0, 0, 100, 100);
|
||||
assertFalse(s.contains(1, 1), "угол срезан");
|
||||
assertTrue(s.contains(1, 50), "середина стороны на месте");
|
||||
}
|
||||
|
||||
@Test
|
||||
void ellipseFitsCell() {
|
||||
Shape s = PresetGeometry.build("ellipse", new int[0], 0, 0, 100, 100);
|
||||
assertTrue(s.contains(50, 50));
|
||||
assertFalse(s.contains(1, 1), "угол вне эллипса");
|
||||
}
|
||||
|
||||
/** Смещение ячейки (a:xfrm/@off) транслирует построенную форму. */
|
||||
@Test
|
||||
void offsetTranslatesBuiltShape() {
|
||||
Shape s = PresetGeometry.build("ellipse", new int[0], 10, 20, 100, 100);
|
||||
Rectangle2D b = s.getBounds2D();
|
||||
assertEquals(10, b.getMinX(), 1e-3);
|
||||
assertEquals(20, b.getMinY(), 1e-3);
|
||||
assertEquals(100, b.getWidth(), 1e-3);
|
||||
assertEquals(100, b.getHeight(), 1e-3);
|
||||
}
|
||||
|
||||
@Test
|
||||
void unknownPresetFallsBackToCellRect() {
|
||||
Shape s = PresetGeometry.build("bogusShape", new int[0], 5, 6, 70, 80);
|
||||
Rectangle2D b = s.getBounds2D();
|
||||
assertEquals(5, b.getX(), EPS);
|
||||
assertEquals(6, b.getY(), EPS);
|
||||
assertEquals(70, b.getWidth(), EPS);
|
||||
assertEquals(80, b.getHeight(), EPS);
|
||||
assertTrue(s.contains(5, 6));
|
||||
}
|
||||
|
||||
@Test
|
||||
void adjustValuesReadsValGuidesByPosition() {
|
||||
CTPresetGeometry2D pg = new CTPresetGeometry2D();
|
||||
CTGeomGuideList av = new CTGeomGuideList();
|
||||
av.getGd().add(guide("adj1", "val 15000"));
|
||||
av.getGd().add(guide("adj2", "ss 5"));
|
||||
pg.setAvLst(av);
|
||||
assertArrayEquals(new int[] {15000, 0}, PresetGeometry.adjustValues(pg));
|
||||
assertEquals(0, PresetGeometry.adjustValues(new CTPresetGeometry2D()).length);
|
||||
}
|
||||
|
||||
private static CTGeomGuide guide(String name, String fmla) {
|
||||
CTGeomGuide g = new CTGeomGuide();
|
||||
g.setName(name);
|
||||
g.setFmla(fmla);
|
||||
return g;
|
||||
}
|
||||
|
||||
/** Точка на эллипсе (50±r) под углом deg (единичная конвенция ECMA: y вниз). */
|
||||
private static boolean onRing(Shape s, double deg, double r) {
|
||||
double t = Math.toRadians(deg);
|
||||
return s.contains(50 + r * Math.cos(t), 50 + r * Math.sin(t));
|
||||
}
|
||||
|
||||
/**
|
||||
* Разбор блоков стандарта: для каждого поддерживаемого пресета —
|
||||
* строки avLst/gdLst («name fmla») и команды pathLst в формате
|
||||
* движка («moveTo x y», «arcTo wR hR stAng swAng», «close»).
|
||||
*/
|
||||
private static Map<String, PresetGeometry.Preset> parseEcmaXml() throws Exception {
|
||||
XMLInputFactory f = XMLInputFactory.newFactory();
|
||||
f.setProperty(XMLInputFactory.SUPPORT_DTD, false);
|
||||
f.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, false);
|
||||
Map<String, PresetGeometry.Preset> out = new LinkedHashMap<>();
|
||||
try (InputStream in = PresetGeometryTest.class.getResourceAsStream(
|
||||
"/geom/presetShapeDefinitions.xml")) {
|
||||
assertTrue(in != null, "ресурс geom/presetShapeDefinitions.xml не найден");
|
||||
XMLStreamReader r = f.createXMLStreamReader(in);
|
||||
int depth = 0;
|
||||
String block = null;
|
||||
String section = null;
|
||||
List<String> av = new ArrayList<>();
|
||||
List<String> gd = new ArrayList<>();
|
||||
List<String> path = new ArrayList<>();
|
||||
while (r.hasNext()) {
|
||||
int ev = r.next();
|
||||
if (ev == XMLStreamConstants.START_ELEMENT) {
|
||||
depth++;
|
||||
String ln = r.getLocalName();
|
||||
if (depth == DEPTH_BLOCK && List.of(SUPPORTED).contains(ln)) {
|
||||
block = ln;
|
||||
av = new ArrayList<>();
|
||||
gd = new ArrayList<>();
|
||||
path = new ArrayList<>();
|
||||
} else if (block != null && depth == DEPTH_SECTION) {
|
||||
section = switch (ln) {
|
||||
case "avLst", "gdLst", "pathLst" -> ln;
|
||||
default -> null;
|
||||
};
|
||||
} else if (block != null && "gd".equals(ln) && section != null) {
|
||||
String entry = r.getAttributeValue(null, "name") + " "
|
||||
+ r.getAttributeValue(null, "fmla");
|
||||
switch (section) {
|
||||
case "avLst" -> av.add(entry);
|
||||
default -> gd.add(entry);
|
||||
}
|
||||
} else if (block != null && "pathLst".equals(section)) {
|
||||
switch (ln) {
|
||||
case "moveTo", "lnTo" -> {
|
||||
String[] pt = readPt(r);
|
||||
path.add(ln + " " + pt[0] + " " + pt[1]);
|
||||
}
|
||||
case "arcTo" -> path.add("arcTo " + r.getAttributeValue(null, "wR")
|
||||
+ " " + r.getAttributeValue(null, "hR")
|
||||
+ " " + r.getAttributeValue(null, "stAng")
|
||||
+ " " + r.getAttributeValue(null, "swAng"));
|
||||
case "close" -> path.add("close");
|
||||
default -> {
|
||||
}
|
||||
}
|
||||
}
|
||||
} else if (ev == XMLStreamConstants.END_ELEMENT) {
|
||||
String ln = r.getLocalName();
|
||||
if (depth == DEPTH_SECTION) {
|
||||
section = null;
|
||||
}
|
||||
if (depth == DEPTH_BLOCK && ln.equals(block)) {
|
||||
out.put(block, new PresetGeometry.Preset(
|
||||
av.toArray(String[]::new),
|
||||
gd.toArray(String[]::new),
|
||||
path.toArray(String[]::new)));
|
||||
block = null;
|
||||
}
|
||||
depth--;
|
||||
}
|
||||
}
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
/** Атрибуты x/y единственного <pt> внутри moveTo/lnTo; <pt/> закрывается здесь. */
|
||||
private static String[] readPt(XMLStreamReader r) throws Exception {
|
||||
while (r.hasNext()) {
|
||||
if (r.next() == XMLStreamConstants.START_ELEMENT
|
||||
&& "pt".equals(r.getLocalName())) {
|
||||
String[] attrs = {
|
||||
r.getAttributeValue(null, "x"),
|
||||
r.getAttributeValue(null, "y"),
|
||||
};
|
||||
boolean closed = false;
|
||||
while (!closed) {
|
||||
closed = r.next() == XMLStreamConstants.END_ELEMENT
|
||||
&& "pt".equals(r.getLocalName());
|
||||
}
|
||||
return attrs;
|
||||
}
|
||||
}
|
||||
throw new IllegalStateException("у команды нет <pt>");
|
||||
}
|
||||
|
||||
/** Формат движка: путь rect'а — ровно контур ячейки. */
|
||||
@Test
|
||||
void rectPathIsCellContour() {
|
||||
PathIterator pi = PresetGeometry.build("rect", new int[0], 0, 0, 100, 100)
|
||||
.getPathIterator(null);
|
||||
double[] p = new double[6];
|
||||
int segments = 0;
|
||||
while (!pi.isDone()) {
|
||||
if (pi.currentSegment(p) != PathIterator.SEG_CLOSE) {
|
||||
segments++;
|
||||
}
|
||||
pi.next();
|
||||
}
|
||||
assertEquals(4, segments);
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user