From 800b6e4b90946360b3d2a0bc50338604a328eb34 Mon Sep 17 00:00:00 2001 From: Pjandro Date: Tue, 20 Oct 2026 22:35:52 +0000 Subject: [PATCH] =?UTF-8?q?feat:=20ChartSpec=20=D1=87=D0=B8=D1=82=D0=B0?= =?UTF-8?q?=D0=B5=D1=82=20c:firstSliceAng/holeSize/gapWidth/overlap=20(ECM?= =?UTF-8?q?A-376,=20=D0=B4=D0=B5=D1=84=D0=BE=D0=BB=D1=82=D1=8B=20Word=200/?= =?UTF-8?q?50/150/0);=20firstSliceAng=20=D1=83=20PIE3D=20=D0=BD=D0=B5?= =?UTF-8?q?=D0=B4=D0=BE=D1=81=D1=82=D1=83=D0=BF=D0=B5=D0=BD=20=D0=B2=20JAX?= =?UTF-8?q?B-=D0=BC=D0=BE=D0=B4=D0=B5=D0=BB=D0=B8=20docx4j=2017.3.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wordpdf/internal/chart/ChartSpec.java | 27 +++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/wordpdf-core/src/main/java/ru/pjandro/wordpdf/internal/chart/ChartSpec.java b/wordpdf-core/src/main/java/ru/pjandro/wordpdf/internal/chart/ChartSpec.java index 37d102c..9c0c5ad 100644 --- a/wordpdf-core/src/main/java/ru/pjandro/wordpdf/internal/chart/ChartSpec.java +++ b/wordpdf-core/src/main/java/ru/pjandro/wordpdf/internal/chart/ChartSpec.java @@ -116,6 +116,13 @@ final class ChartSpec { double depthPercent = 100; double perspective = 30; boolean rightAngledAxes = true; + // Спека-параметры DrawingML, исполнение Word; дефолты — ECMA-376/Word. + // firstSliceAng для PIE3D не читается: в JAXB-модели docx4j 17.3.2 + // у CTPie3DChart геттера CTFirstSliceAng нет. + double firstSliceAng = 0; + double holeSize = 50; + double gapWidth = 150; + double overlap = 0; final List bandColors = new ArrayList<>(); boolean wireframe; Color chartFill = Color.WHITE; @@ -219,8 +226,8 @@ final class ChartSpec { } } - private static void readGroup(Object group, ChartSpec spec, DrawMlColor colors, - List palette) { + static void readGroup(Object group, ChartSpec spec, DrawMlColor colors, + List palette) { if (group instanceof CTPie3DChart g) { spec.type = Type.PIE3D; for (CTPieSer s : g.getSer()) { @@ -228,11 +235,20 @@ final class ChartSpec { } } else if (group instanceof CTPieChart g) { spec.type = Type.PIE; + if (g.getFirstSliceAng() != null) { + spec.firstSliceAng = g.getFirstSliceAng().getVal(); + } for (CTPieSer s : g.getSer()) { spec.series.add(readPieSer(s, colors)); } } else if (group instanceof CTDoughnutChart g) { spec.type = Type.DOUGHNUT; + if (g.getFirstSliceAng() != null) { + spec.firstSliceAng = g.getFirstSliceAng().getVal(); + } + if (g.getHoleSize() != null) { + spec.holeSize = g.getHoleSize().getVal(); + } for (CTPieSer s : g.getSer()) { spec.series.add(readPieSer(s, colors)); } @@ -257,6 +273,13 @@ final class ChartSpec { && g.getBarDir().getVal() != null && "bar".equalsIgnoreCase(g.getBarDir().getVal().value()); spec.type = horizontal ? Type.BAR_HORIZONTAL : Type.BAR; + // getVal() у CTGapAmount/CTOverlap — примитив, проверяется только обёртка + if (g.getGapWidth() != null) { + spec.gapWidth = g.getGapWidth().getVal(); + } + if (g.getOverlap() != null) { + spec.overlap = g.getOverlap().getVal(); + } for (CTBarSer s : g.getSer()) { Series ser = new Series(); readCommon(s.getTx(), s.getCat(), s.getVal(), s.getDPt(), ser, colors);