chart: lineChart c:grouping stacked/percentStacked (§21.2.2.76) — ряд на накопленной сумме
PR checks / web (pull_request) Successful in 32s
PR checks / java (pull_request) Successful in 1m38s
Main: tests, deploy, autotests / web (push) Successful in 31s
Main: tests, deploy, autotests / images-web (push) Successful in 32s
Main: tests, deploy, autotests / java (push) Successful in 1m27s
Main: tests, deploy, autotests / images-app (push) Successful in 44s
Main: tests, deploy, autotests / deploy (push) Successful in 1m29s
Main: tests, deploy, autotests / autotests (push) Successful in 40s
Main: tests, deploy, autotests / rollback (push) Has been skipped
PR checks / web (pull_request) Successful in 32s
PR checks / java (pull_request) Successful in 1m38s
Main: tests, deploy, autotests / web (push) Successful in 31s
Main: tests, deploy, autotests / images-web (push) Successful in 32s
Main: tests, deploy, autotests / java (push) Successful in 1m27s
Main: tests, deploy, autotests / images-app (push) Successful in 44s
Main: tests, deploy, autotests / deploy (push) Successful in 1m29s
Main: tests, deploy, autotests / autotests (push) Successful in 40s
Main: tests, deploy, autotests / rollback (push) Has been skipped
- ChartSpec: чтение c:grouping у CTLineChart (line3D осознанно игнорирует) - CartesianPainter (LINE): кумулятивный диапазон оси и ломаные по stackedCumulative; percentStacked — нормировка к 100 - хелперы isStacked/stackedCumulative/stackedRange переехали из Cartesian3dPainter в ChartRenderer (общие для 2-D и 3-D) - фикстура chart-types.docx: +10-я диаграмма «График с накоплением»; тест переименован в chartTypes_allTypesRenderAsImages (чинит 14 stale-javadoc-ссылок), assertEquals(10, …) - юниты ChartSpecTest/ChartRendererTest + пиксельные CartesianPainterTest (инверсия порядка линий stacked vs standard; плоский верх 100% в percentStacked)
This commit was merged in pull request #45.
This commit is contained in:
+3
-59
@@ -73,11 +73,11 @@ final class Cartesian3dPainter {
|
||||
// игнорируется (Word UI не предлагает 3-D Stacked Line), горизонтальный
|
||||
// bar3D остаётся кластерным.
|
||||
boolean stacked = (bar3d && !horizontal || spec.type == ChartSpec.Type.AREA3D)
|
||||
&& isStacked(spec.grouping);
|
||||
&& ChartRenderer.isStacked(spec.grouping);
|
||||
boolean percent = stacked && "percentStacked".equalsIgnoreCase(spec.grouping);
|
||||
// Кумулятивные значения по категориям: ряд si — полоса/сегмент cum[si]..cum[si+1].
|
||||
double[][] cum = stacked ? stackedCumulative(spec, percent) : null;
|
||||
double[] range = stacked ? stackedRange(cum) : ChartRenderer.valueRange(spec);
|
||||
double[][] cum = stacked ? ChartRenderer.stackedCumulative(spec, percent) : null;
|
||||
double[] range = stacked ? ChartRenderer.stackedRange(cum) : ChartRenderer.valueRange(spec);
|
||||
double[] bounds = ChartRenderer.axisBounds(valAxis, range[0], range[1]);
|
||||
double lo = bounds[0];
|
||||
double hi = bounds[1];
|
||||
@@ -278,62 +278,6 @@ final class Cartesian3dPainter {
|
||||
return new Column(center, faces);
|
||||
}
|
||||
|
||||
/** c:grouping stacked/percentStacked (§21.2.2.76). */
|
||||
private static boolean isStacked(String grouping) {
|
||||
return "stacked".equalsIgnoreCase(grouping)
|
||||
|| "percentStacked".equalsIgnoreCase(grouping);
|
||||
}
|
||||
|
||||
/** Кумулятивные значения stacked: cum[si][c] — сумма рядов 0..si в категории c;
|
||||
* percentStacked — доля от суммы категории ×100 (сумма 0 → 0). */
|
||||
private static double[][] stackedCumulative(ChartSpec spec, boolean percent) {
|
||||
int nSer = spec.series.size();
|
||||
int nCat = 0;
|
||||
for (ChartSpec.Series s : spec.series) {
|
||||
nCat = Math.max(nCat, s.values.size());
|
||||
}
|
||||
double[] totals = new double[nCat];
|
||||
if (percent) {
|
||||
for (ChartSpec.Series s : spec.series) {
|
||||
for (int c = 0; c < s.values.size(); c++) {
|
||||
Double v = s.values.get(c);
|
||||
if (v != null) {
|
||||
totals[c] += v;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
double[][] cum = new double[nSer][nCat];
|
||||
for (int c = 0; c < nCat; c++) {
|
||||
double running = 0;
|
||||
for (int si = 0; si < nSer; si++) {
|
||||
List<Double> vals = spec.series.get(si).values;
|
||||
Double v = c < vals.size() ? vals.get(c) : null;
|
||||
double add = v == null ? 0 : v;
|
||||
if (percent) {
|
||||
add = totals[c] == 0 ? 0 : add / totals[c] * 100.0;
|
||||
}
|
||||
running += add;
|
||||
cum[si][c] = running;
|
||||
}
|
||||
}
|
||||
return cum;
|
||||
}
|
||||
|
||||
/** Диапазон значений stacked: от 0 до максимума кумулятивных вершин (учитывая
|
||||
* отрицательные суммы). */
|
||||
private static double[] stackedRange(double[][] cum) {
|
||||
double min = 0;
|
||||
double max = 0;
|
||||
for (double[] row : cum) {
|
||||
for (double v : row) {
|
||||
min = Math.min(min, v);
|
||||
max = Math.max(max, v);
|
||||
}
|
||||
}
|
||||
return new double[]{min, max};
|
||||
}
|
||||
|
||||
/** Сегмент stacked bar3D: box от wBottom до wTop на полной полосе глубины
|
||||
* категории (центр v=0, colD от c:gapDepth). */
|
||||
private static Column makeStackedColumn(Color color, int c, int nCat,
|
||||
|
||||
@@ -35,7 +35,12 @@ final class CartesianPainter {
|
||||
}
|
||||
List<String> cats = categoriesOf(spec, nCat);
|
||||
|
||||
double[] range = ChartRenderer.valueRange(spec);
|
||||
// §21.2.2.76 + §21.2.3.17: stacked — ряд на накопленной сумме предыдущих;
|
||||
// percentStacked — суммы категорий нормируются к 100. Только LINE (2-D).
|
||||
boolean stacked = spec.type == ChartSpec.Type.LINE && ChartRenderer.isStacked(spec.grouping);
|
||||
boolean percent = stacked && "percentStacked".equalsIgnoreCase(spec.grouping);
|
||||
double[][] cum = stacked ? ChartRenderer.stackedCumulative(spec, percent) : null;
|
||||
double[] range = stacked ? ChartRenderer.stackedRange(cum) : ChartRenderer.valueRange(spec);
|
||||
double[] bounds = ChartRenderer.axisBounds(valAxis, range[0], range[1], true);
|
||||
double lo = bounds[0];
|
||||
double hi = bounds[1];
|
||||
@@ -110,7 +115,7 @@ final class CartesianPainter {
|
||||
|
||||
// 3. Ряды
|
||||
switch (spec.type) {
|
||||
case LINE -> drawLines(g, spec, plot, palette, lo, hi, nCat, horizontal);
|
||||
case LINE -> drawLines(g, spec, plot, palette, lo, hi, nCat, horizontal, cum);
|
||||
case AREA -> drawAreas(g, spec, plot, palette, lo, hi, nCat, horizontal);
|
||||
case BAR, BAR_HORIZONTAL -> drawBars(g, spec, plot, palette, lo, hi, nCat, horizontal);
|
||||
default -> {
|
||||
@@ -226,7 +231,7 @@ final class CartesianPainter {
|
||||
|
||||
private static void drawLines(Graphics2D g, ChartSpec spec, Rectangle2D plot,
|
||||
List<Color> palette, double lo, double hi, int nCat,
|
||||
boolean horizontal) {
|
||||
boolean horizontal, double[][] cum) {
|
||||
for (int si = 0; si < spec.series.size(); si++) {
|
||||
ChartSpec.Series s = spec.series.get(si);
|
||||
Color c = s.lineColor != null ? s.lineColor : s.fillAt(si, palette);
|
||||
@@ -236,13 +241,20 @@ final class CartesianPainter {
|
||||
BasicStroke.JOIN_ROUND));
|
||||
List<Double> along = new ArrayList<>();
|
||||
List<Double> cross = new ArrayList<>();
|
||||
for (int i = 0; i < s.values.size(); i++) {
|
||||
Double v = s.values.get(i);
|
||||
if (v == null) {
|
||||
continue;
|
||||
if (cum != null) {
|
||||
for (int i = 0; i < nCat; i++) {
|
||||
along.add(catPos(i, nCat, plot, horizontal));
|
||||
cross.add(valuePos(cum[si][i], lo, hi, plot, horizontal));
|
||||
}
|
||||
} else {
|
||||
for (int i = 0; i < s.values.size(); i++) {
|
||||
Double v = s.values.get(i);
|
||||
if (v == null) {
|
||||
continue;
|
||||
}
|
||||
along.add(catPos(i, nCat, plot, horizontal));
|
||||
cross.add(valuePos(v, lo, hi, plot, horizontal));
|
||||
}
|
||||
along.add(catPos(i, nCat, plot, horizontal));
|
||||
cross.add(valuePos(v, lo, hi, plot, horizontal));
|
||||
}
|
||||
if (along.size() >= MIN_POLYLINE_POINTS) {
|
||||
g.draw(ChartRenderer.polyline(along, cross, false));
|
||||
|
||||
@@ -310,6 +310,62 @@ final class ChartRenderer {
|
||||
return new double[]{min, max};
|
||||
}
|
||||
|
||||
/** c:grouping stacked/percentStacked (§21.2.2.76). */
|
||||
static boolean isStacked(String grouping) {
|
||||
return "stacked".equalsIgnoreCase(grouping)
|
||||
|| "percentStacked".equalsIgnoreCase(grouping);
|
||||
}
|
||||
|
||||
/** Кумулятивные значения stacked: cum[si][c] — сумма рядов 0..si в категории c;
|
||||
* percentStacked — доля от суммы категории ×100 (сумма 0 → 0). */
|
||||
static double[][] stackedCumulative(ChartSpec spec, boolean percent) {
|
||||
int nSer = spec.series.size();
|
||||
int nCat = 0;
|
||||
for (ChartSpec.Series s : spec.series) {
|
||||
nCat = Math.max(nCat, s.values.size());
|
||||
}
|
||||
double[] totals = new double[nCat];
|
||||
if (percent) {
|
||||
for (ChartSpec.Series s : spec.series) {
|
||||
for (int c = 0; c < s.values.size(); c++) {
|
||||
Double v = s.values.get(c);
|
||||
if (v != null) {
|
||||
totals[c] += v;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
double[][] cum = new double[nSer][nCat];
|
||||
for (int c = 0; c < nCat; c++) {
|
||||
double running = 0;
|
||||
for (int si = 0; si < nSer; si++) {
|
||||
List<Double> vals = spec.series.get(si).values;
|
||||
Double v = c < vals.size() ? vals.get(c) : null;
|
||||
double add = v == null ? 0 : v;
|
||||
if (percent) {
|
||||
add = totals[c] == 0 ? 0 : add / totals[c] * 100.0;
|
||||
}
|
||||
running += add;
|
||||
cum[si][c] = running;
|
||||
}
|
||||
}
|
||||
return cum;
|
||||
}
|
||||
|
||||
/** Диапазон значений stacked: от 0 до максимума кумулятивных вершин (учитывая
|
||||
* отрицательные суммы). */
|
||||
static double[] stackedRange(double[][] cum) {
|
||||
double min = 0;
|
||||
double max = 0;
|
||||
for (double[] row : cum) {
|
||||
for (double v : row) {
|
||||
min = Math.min(min, v);
|
||||
max = Math.max(max, v);
|
||||
}
|
||||
}
|
||||
return new double[]{min, max};
|
||||
}
|
||||
|
||||
/**
|
||||
* «Круглый» шаг делений (1/2/5 * 10^n), как подбирает Word.
|
||||
*/
|
||||
|
||||
@@ -157,8 +157,8 @@ final class ChartSpec {
|
||||
Double hPercent;
|
||||
double perspective = 30;
|
||||
boolean rightAngledAxes = true;
|
||||
/** c:grouping 3D-групп (§21.2.2.76): standard|clustered|stacked|percentStacked;
|
||||
* используют только bar3D/area3D. */
|
||||
/** c:grouping (§21.2.2.76): standard|clustered|stacked|percentStacked;
|
||||
* используют lineChart (2-D) и bar3D/area3D; 2-D area/bar не читают. */
|
||||
String grouping = "standard";
|
||||
// Спека-параметры DrawingML, исполнение Word; дефолты — ECMA-376/Word.
|
||||
// firstSliceAng (§21.2.2.68) определён только для CT_PieChart/CT_DoughnutChart;
|
||||
@@ -358,6 +358,9 @@ final class ChartSpec {
|
||||
}
|
||||
} else if (group instanceof CTLineChart g) {
|
||||
spec.type = Type.LINE;
|
||||
if (g.getGrouping() != null && g.getGrouping().getVal() != null) {
|
||||
spec.grouping = g.getGrouping().getVal().value();
|
||||
}
|
||||
for (CTLineSer s : g.getSer()) {
|
||||
spec.series.add(readLineSer(s, colors));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user