chart: stock-ряды с a:ln/a:noFill не рисуют ломаную
PR checks / java (pull_request) Successful in 1m28s
PR checks / web (pull_request) Successful in 43s
Main: tests, deploy, autotests / web (push) Successful in 34s
Main: tests, deploy, autotests / images-web (push) Successful in 31s
Main: tests, deploy, autotests / java (push) Successful in 1m25s
Main: tests, deploy, autotests / images-app (push) Successful in 48s
Main: tests, deploy, autotests / deploy (push) Successful in 1m43s
Main: tests, deploy, autotests / autotests (push) Successful in 44s
Main: tests, deploy, autotests / rollback (push) Has been skipped
PR checks / java (pull_request) Successful in 1m28s
PR checks / web (pull_request) Successful in 43s
Main: tests, deploy, autotests / web (push) Successful in 34s
Main: tests, deploy, autotests / images-web (push) Successful in 31s
Main: tests, deploy, autotests / java (push) Successful in 1m25s
Main: tests, deploy, autotests / images-app (push) Successful in 48s
Main: tests, deploy, autotests / deploy (push) Successful in 1m43s
Main: tests, deploy, autotests / autotests (push) Successful in 44s
Main: tests, deploy, autotests / rollback (push) Has been skipped
Word пишет всем рядам шаблона Open-High-Low-Close <a:ln><a:noFill/></a:ln> — ранее StockPainter рисовал ломаную каждого ряда безусловно, из-за чего между столбцами upDownBars появлялись зигзаг-полоски. Флаг ChartSpec.Series.lineNoFill теперь учитывается при отрисовке; dropLines и маркеры — по своим флагам. Регрессия — StockPainterTest#seriesLineNoFill_notDrawn.
This commit was merged in pull request #49.
This commit is contained in:
@@ -21,6 +21,10 @@ import java.util.List;
|
|||||||
*
|
*
|
||||||
* Регрессия — StockPainterTest, фикстура samples/chart-types.docx
|
* Регрессия — StockPainterTest, фикстура samples/chart-types.docx
|
||||||
* (WordPdfConverterTest#chartTypes_allTypesRenderAsImages).
|
* (WordPdfConverterTest#chartTypes_allTypesRenderAsImages).
|
||||||
|
*
|
||||||
|
* Ряды с a:ln/a:noFill (так Word пишет все ряды шаблона Open-High-Low-Close)
|
||||||
|
* не рисуют ломаную — иначе между столбцами upDownBars появлялись
|
||||||
|
* зигзаг-полоски. Регрессия — StockPainterTest#seriesLineNoFill_notDrawn.
|
||||||
*/
|
*/
|
||||||
final class StockPainter {
|
final class StockPainter {
|
||||||
|
|
||||||
@@ -156,7 +160,7 @@ final class StockPainter {
|
|||||||
g.draw(new Line2D.Double(xs.get(i), ys.get(i), xs.get(i), base));
|
g.draw(new Line2D.Double(xs.get(i), ys.get(i), xs.get(i), base));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (xs.size() >= MIN_POLYLINE_POINTS) {
|
if (!s.lineNoFill && xs.size() >= MIN_POLYLINE_POINTS) {
|
||||||
g.setColor(c);
|
g.setColor(c);
|
||||||
g.setStroke(new BasicStroke((float) (s.lineWidth > 0 ? s.lineWidth : 2.25),
|
g.setStroke(new BasicStroke((float) (s.lineWidth > 0 ? s.lineWidth : 2.25),
|
||||||
BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
|
BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
|
||||||
|
|||||||
@@ -66,6 +66,24 @@ class StockPainterTest {
|
|||||||
assertEquals(0, countColor(img, DROP));
|
assertEquals(0, countColor(img, DROP));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** a:ln/a:noFill ряда (Word-шаблон OHLC): ломаная ряда не рисуется. */
|
||||||
|
@Test
|
||||||
|
void seriesLineNoFill_notDrawn() {
|
||||||
|
Color line = new Color(0x12, 0x34, 0x56);
|
||||||
|
ChartSpec spec = stockSpec(false, false, false);
|
||||||
|
for (ChartSpec.Series s : spec.series) {
|
||||||
|
s.lineColor = line;
|
||||||
|
s.marker = false;
|
||||||
|
}
|
||||||
|
assertTrue(countColor(render(spec), line) > 50,
|
||||||
|
"линия ряда без noFill не нарисована");
|
||||||
|
for (ChartSpec.Series s : spec.series) {
|
||||||
|
s.lineNoFill = true;
|
||||||
|
}
|
||||||
|
assertEquals(0, countColor(render(spec), line),
|
||||||
|
"a:ln/a:noFill ряда проигнорирован — ломаная нарисована");
|
||||||
|
}
|
||||||
|
|
||||||
/** @param inverted последний ряд ниже первого (down-полоса). */
|
/** @param inverted последний ряд ниже первого (down-полоса). */
|
||||||
private static ChartSpec stockSpec(boolean withDrop, boolean withUpDown,
|
private static ChartSpec stockSpec(boolean withDrop, boolean withUpDown,
|
||||||
boolean inverted) {
|
boolean inverted) {
|
||||||
|
|||||||
Reference in New Issue
Block a user